diff --git a/tests/handlers/test_presencelike.py b/tests/handlers/test_presencelike.py
index 977e832da7..19107caeee 100644
--- a/tests/handlers/test_presencelike.py
+++ b/tests/handlers/test_presencelike.py
@@ -101,8 +101,8 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
self.datastore.get_profile_avatar_url = get_profile_avatar_url
self.presence_list = [
- {"observed_user_id": "@banana:test"},
- {"observed_user_id": "@clementine:test"},
+ {"observed_user_id": "@banana:test", "accepted": True},
+ {"observed_user_id": "@clementine:test", "accepted": True},
]
def get_presence_list(user_localpart, accepted=None):
return defer.succeed(self.presence_list)
@@ -144,8 +144,8 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
@defer.inlineCallbacks
def test_set_my_state(self):
self.presence_list = [
- {"observed_user_id": "@banana:test"},
- {"observed_user_id": "@clementine:test"},
+ {"observed_user_id": "@banana:test", "accepted": True},
+ {"observed_user_id": "@clementine:test", "accepted": True},
]
mocked_set = self.datastore.set_presence_state
@@ -167,8 +167,8 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
self.mock_get_joined.side_effect = get_joined
self.presence_list = [
- {"observed_user_id": "@banana:test"},
- {"observed_user_id": "@clementine:test"},
+ {"observed_user_id": "@banana:test", "accepted": True},
+ {"observed_user_id": "@clementine:test", "accepted": True},
]
self.datastore.set_presence_state.return_value = defer.succeed(
@@ -203,26 +203,20 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
"presence": ONLINE,
"last_active_ago": 0,
"displayname": "Frank",
- "avatar_url": "http://foo"},
+ "avatar_url": "http://foo",
+ "accepted": True},
{"observed_user": self.u_clementine,
- "presence": OFFLINE}
+ "presence": OFFLINE,
+ "accepted": True}
], presence)
self.mock_update_client.assert_has_calls([
- call(users_to_push=set([self.u_apple, self.u_banana, self.u_clementine]),
- room_ids=[],
- observed_user=self.u_apple,
- statuscache=ANY), # self-reflection
+ call(
+ users_to_push={self.u_apple, self.u_banana, self.u_clementine},
+ room_ids=[]
+ ),
], any_order=True)
- statuscache = self.mock_update_client.call_args[1]["statuscache"]
- self.assertEquals({
- "presence": ONLINE,
- "last_active": 1000000, # MockClock
- "displayname": "Frank",
- "avatar_url": "http://foo",
- }, statuscache.state)
-
self.mock_update_client.reset_mock()
self.datastore.set_profile_displayname.return_value = defer.succeed(
@@ -232,25 +226,16 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
self.u_apple, "I am an Apple")
self.mock_update_client.assert_has_calls([
- call(users_to_push=set([self.u_apple, self.u_banana, self.u_clementine]),
+ call(
+ users_to_push={self.u_apple, self.u_banana, self.u_clementine},
room_ids=[],
- observed_user=self.u_apple,
- statuscache=ANY), # self-reflection
+ ),
], any_order=True)
- statuscache = self.mock_update_client.call_args[1]["statuscache"]
- self.assertEquals({
- "presence": ONLINE,
- "last_active": 1000000, # MockClock
- "displayname": "I am an Apple",
- "avatar_url": "http://foo",
- }, statuscache.state)
-
-
@defer.inlineCallbacks
def test_push_remote(self):
self.presence_list = [
- {"observed_user_id": "@potato:remote"},
+ {"observed_user_id": "@potato:remote", "accepted": True},
]
self.datastore.set_presence_state.return_value = defer.succeed(
@@ -314,13 +299,7 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
self.mock_update_client.assert_called_with(
users_to_push=set([self.u_apple]),
room_ids=[],
- observed_user=self.u_potato,
- statuscache=ANY)
-
- statuscache = self.mock_update_client.call_args[1]["statuscache"]
- self.assertEquals({"presence": ONLINE,
- "displayname": "Frank",
- "avatar_url": "http://foo"}, statuscache.state)
+ )
state = yield self.handlers.presence_handler.get_state(self.u_potato,
self.u_apple)
|
