diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-05-22 16:04:40 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-05-22 16:04:40 +0100 |
| commit | 49a2c102791bf79d1dfc25eccd2c17689a2e95a4 (patch) | |
| tree | ed4582c49fca4a192b6451e155776e336b87c32e /tests/handlers/test_presence.py | |
| parent | Merge pull request #160 from matrix-org/markjh/appservice_performance (diff) | |
| parent | Remove spurious TODO comment (diff) | |
| download | synapse-49a2c102791bf79d1dfc25eccd2c17689a2e95a4.tar.xz | |
Merge pull request #157 from matrix-org/markjh/presence_performance
Improve presence performance in loadtest
Diffstat (limited to 'tests/handlers/test_presence.py')
| -rw-r--r-- | tests/handlers/test_presence.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py index ee773797e7..12cf5747a2 100644 --- a/tests/handlers/test_presence.py +++ b/tests/handlers/test_presence.py @@ -624,6 +624,7 @@ class PresencePushTestCase(MockedDatastorePresenceTestCase): """ PRESENCE_LIST = { 'apple': [ "@banana:test", "@clementine:test" ], + 'banana': [ "@apple:test" ], } @defer.inlineCallbacks @@ -836,12 +837,7 @@ class PresencePushTestCase(MockedDatastorePresenceTestCase): @defer.inlineCallbacks def test_recv_remote(self): - # TODO(paul): Gut-wrenching - potato_set = self.handler._remote_recvmap.setdefault(self.u_potato, - set()) - potato_set.add(self.u_apple) - - self.room_members = [self.u_banana, self.u_potato] + self.room_members = [self.u_apple, self.u_banana, self.u_potato] self.assertEquals(self.event_source.get_current_key(), 0) @@ -886,11 +882,8 @@ class PresencePushTestCase(MockedDatastorePresenceTestCase): @defer.inlineCallbacks def test_recv_remote_offline(self): """ Various tests relating to SYN-261 """ - potato_set = self.handler._remote_recvmap.setdefault(self.u_potato, - set()) - potato_set.add(self.u_apple) - self.room_members = [self.u_banana, self.u_potato] + self.room_members = [self.u_apple, self.u_banana, self.u_potato] self.assertEquals(self.event_source.get_current_key(), 0) |