diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-05-22 17:02:23 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-05-22 17:02:23 +0100 |
| commit | d9f60e8dc8d575e5bdd9f10da760e5cb0cdf57af (patch) | |
| tree | 62b5d56292f776b4ce69fb652673260d9793d91b /tests/handlers/test_presence.py | |
| parent | Merge pull request #164 from matrix-org/markjh/pusher_performance_2 (diff) | |
| parent | Fix the presence tests (diff) | |
| download | synapse-d9f60e8dc8d575e5bdd9f10da760e5cb0cdf57af.tar.xz | |
Merge pull request #163 from matrix-org/markjh/presence_list_cache
Add a cache for the presence list
Diffstat (limited to 'tests/handlers/test_presence.py')
| -rw-r--r-- | tests/handlers/test_presence.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py index 12cf5747a2..29372d488a 100644 --- a/tests/handlers/test_presence.py +++ b/tests/handlers/test_presence.py @@ -233,7 +233,7 @@ class MockedDatastorePresenceTestCase(PresenceTestCase): if not user_localpart in self.PRESENCE_LIST: return defer.succeed([]) return defer.succeed([ - {"observed_user_id": u} for u in + {"observed_user_id": u, "accepted": accepted} for u in self.PRESENCE_LIST[user_localpart]]) datastore.get_presence_list = get_presence_list @@ -734,10 +734,12 @@ class PresencePushTestCase(MockedDatastorePresenceTestCase): self.assertEquals( [ - {"observed_user": self.u_banana, - "presence": OFFLINE}, + {"observed_user": self.u_banana, + "presence": OFFLINE, + "accepted": True}, {"observed_user": self.u_clementine, - "presence": OFFLINE}, + "presence": OFFLINE, + "accepted": True}, ], presence ) @@ -758,9 +760,11 @@ class PresencePushTestCase(MockedDatastorePresenceTestCase): self.assertEquals([ {"observed_user": self.u_banana, "presence": ONLINE, - "last_active_ago": 2000}, + "last_active_ago": 2000, + "accepted": True}, {"observed_user": self.u_clementine, - "presence": OFFLINE}, + "presence": OFFLINE, + "accepted": True}, ], presence) (events, _) = yield self.event_source.get_new_events_for_user( |