diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 8506961d2d..74ac3ea8f5 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -142,7 +142,7 @@ class PresenceStateTestCase(unittest.TestCase):
)
self.assertEquals(
- {"state": ONLINE, "presence": ONLINE, "status_msg": "Online"},
+ {"presence": ONLINE, "status_msg": "Online"},
state
)
mocked_get.assert_called_with("apple")
@@ -159,7 +159,7 @@ class PresenceStateTestCase(unittest.TestCase):
)
self.assertEquals(
- {"state": ONLINE, "presence": ONLINE, "status_msg": "Online"},
+ {"presence": ONLINE, "status_msg": "Online"},
state
)
mocked_get.assert_called_with("apple")
@@ -178,7 +178,7 @@ class PresenceStateTestCase(unittest.TestCase):
)
self.assertEquals(
- {"state": ONLINE, "presence": ONLINE, "status_msg": "Online"},
+ {"presence": ONLINE, "status_msg": "Online"},
state
)
@@ -208,7 +208,8 @@ class PresenceStateTestCase(unittest.TestCase):
state={"presence": UNAVAILABLE, "status_msg": "Away"})
mocked_set.assert_called_with("apple",
- {"state": UNAVAILABLE, "status_msg": "Away"})
+ {"state": UNAVAILABLE, "status_msg": "Away"}
+ )
self.mock_start.assert_called_with(self.u_apple,
state={
"presence": UNAVAILABLE,
@@ -460,8 +461,7 @@ class PresenceInvitesTestCase(unittest.TestCase):
self.assertEquals([
{"observed_user": self.u_banana,
- "presence": OFFLINE,
- "state": OFFLINE},
+ "presence": OFFLINE},
], presence)
self.datastore.get_presence_list.assert_called_with("apple",
@@ -478,8 +478,7 @@ class PresenceInvitesTestCase(unittest.TestCase):
self.assertEquals([
{"observed_user": self.u_banana,
- "presence": OFFLINE,
- "state": OFFLINE},
+ "presence": OFFLINE},
], presence)
self.datastore.get_presence_list.assert_called_with("apple",
@@ -625,7 +624,8 @@ class PresencePushTestCase(unittest.TestCase):
self.room_members = [self.u_apple, self.u_elderberry]
self.datastore.set_presence_state.return_value = defer.succeed(
- {"state": ONLINE})
+ {"state": ONLINE}
+ )
# TODO(paul): Gut-wrenching
self.handler._user_cachemap[self.u_apple] = UserPresenceCache()
@@ -654,7 +654,6 @@ class PresencePushTestCase(unittest.TestCase):
"content": {
"user_id": "@apple:test",
"presence": ONLINE,
- "state": ONLINE,
"last_active_ago": 0,
}},
],
@@ -673,7 +672,6 @@ class PresencePushTestCase(unittest.TestCase):
"content": {
"user_id": "@apple:test",
"presence": ONLINE,
- "state": ONLINE,
"last_active_ago": 0,
}},
],
@@ -692,7 +690,6 @@ class PresencePushTestCase(unittest.TestCase):
"content": {
"user_id": "@apple:test",
"presence": ONLINE,
- "state": ONLINE,
"last_active_ago": 0,
}},
],
@@ -715,11 +712,9 @@ class PresencePushTestCase(unittest.TestCase):
self.assertEquals(
[
{"observed_user": self.u_banana,
- "presence": OFFLINE,
- "state": OFFLINE},
+ "presence": OFFLINE},
{"observed_user": self.u_clementine,
- "presence": OFFLINE,
- "state": OFFLINE},
+ "presence": OFFLINE},
],
presence
)
@@ -740,11 +735,9 @@ class PresencePushTestCase(unittest.TestCase):
self.assertEquals([
{"observed_user": self.u_banana,
"presence": ONLINE,
- "state": ONLINE,
"last_active_ago": 2000},
{"observed_user": self.u_clementine,
- "presence": OFFLINE,
- "state": OFFLINE},
+ "presence": OFFLINE},
], presence)
(events, _) = yield self.event_source.get_new_events_for_user(
@@ -758,7 +751,6 @@ class PresencePushTestCase(unittest.TestCase):
"content": {
"user_id": "@banana:test",
"presence": ONLINE,
- "state": ONLINE,
"last_active_ago": 2000
}},
]
@@ -775,7 +767,6 @@ class PresencePushTestCase(unittest.TestCase):
"push": [
{"user_id": "@apple:test",
"presence": u"online",
- "state": u"online",
"last_active_ago": 0},
],
}
@@ -791,7 +782,6 @@ class PresencePushTestCase(unittest.TestCase):
"push": [
{"user_id": "@apple:test",
"presence": u"online",
- "state": u"online",
"last_active_ago": 0},
],
}
@@ -837,7 +827,7 @@ class PresencePushTestCase(unittest.TestCase):
content={
"push": [
{"user_id": "@potato:remote",
- "state": "online",
+ "presence": "online",
"last_active_ago": 1000},
],
}
@@ -855,7 +845,6 @@ class PresencePushTestCase(unittest.TestCase):
"content": {
"user_id": "@potato:remote",
"presence": ONLINE,
- "state": ONLINE,
"last_active_ago": 1000,
}}
]
@@ -866,7 +855,7 @@ class PresencePushTestCase(unittest.TestCase):
state = yield self.handler.get_state(self.u_potato, self.u_apple)
self.assertEquals(
- {"state": ONLINE, "presence": ONLINE, "last_active_ago": 3000},
+ {"presence": ONLINE, "last_active_ago": 3000},
state
)
@@ -902,7 +891,6 @@ class PresencePushTestCase(unittest.TestCase):
"content": {
"user_id": "@clementine:test",
"presence": ONLINE,
- "state": ONLINE,
"last_active_ago": 0,
}}
]
@@ -919,8 +907,7 @@ class PresencePushTestCase(unittest.TestCase):
content={
"push": [
{"user_id": "@apple:test",
- "presence": "online",
- "state": "online"},
+ "presence": "online"},
],
}
),
@@ -934,8 +921,7 @@ class PresencePushTestCase(unittest.TestCase):
content={
"push": [
{"user_id": "@banana:test",
- "presence": "offline",
- "state": "offline"},
+ "presence": "offline"},
],
}
),
@@ -964,8 +950,7 @@ class PresencePushTestCase(unittest.TestCase):
content={
"push": [
{"user_id": "@clementine:test",
- "presence": "online",
- "state": "online"},
+ "presence": "online"},
],
}
),
@@ -1264,7 +1249,6 @@ class PresencePollingTestCase(unittest.TestCase):
"push": [
{"user_id": "@banana:test",
"presence": "offline",
- "state": "offline",
"status_msg": None},
],
},
diff --git a/tests/handlers/test_presencelike.py b/tests/handlers/test_presencelike.py
index 638e506d34..fc0ef8c705 100644
--- a/tests/handlers/test_presencelike.py
+++ b/tests/handlers/test_presencelike.py
@@ -148,10 +148,11 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
yield self.handlers.presence_handler.set_state(
target_user=self.u_apple, auth_user=self.u_apple,
- state={"state": UNAVAILABLE, "status_msg": "Away"})
+ state={"presence": UNAVAILABLE, "status_msg": "Away"})
mocked_set.assert_called_with("apple",
- {"state": UNAVAILABLE, "status_msg": "Away"})
+ {"state": UNAVAILABLE, "status_msg": "Away"}
+ )
@defer.inlineCallbacks
def test_push_local(self):
@@ -161,7 +162,8 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
]
self.datastore.set_presence_state.return_value = defer.succeed(
- {"state": ONLINE})
+ {"state": ONLINE}
+ )
# TODO(paul): Gut-wrenching
from synapse.handlers.presence import UserPresenceCache
@@ -177,9 +179,11 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
apple_set.add(self.u_clementine)
yield self.handlers.presence_handler.set_state(self.u_apple,
- self.u_apple, {"state": ONLINE})
+ self.u_apple, {"presence": ONLINE}
+ )
yield self.handlers.presence_handler.set_state(self.u_banana,
- self.u_banana, {"state": ONLINE})
+ self.u_banana, {"presence": ONLINE}
+ )
presence = yield self.handlers.presence_handler.get_presence_list(
observer_user=self.u_apple, accepted=True)
@@ -187,14 +191,12 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
self.assertEquals([
{"observed_user": self.u_banana,
"presence": ONLINE,
- "state": ONLINE,
"last_active_ago": 0,
"displayname": "Frank",
"avatar_url": "http://foo"},
{"observed_user": self.u_clementine,
- "presence": OFFLINE,
- "state": OFFLINE}],
- presence)
+ "presence": OFFLINE}
+ ], presence)
self.mock_update_client.assert_has_calls([
call(users_to_push=set([self.u_apple, self.u_banana, self.u_clementine]),
@@ -242,7 +244,8 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
]
self.datastore.set_presence_state.return_value = defer.succeed(
- {"state": ONLINE})
+ {"state": ONLINE}
+ )
# TODO(paul): Gut-wrenching
from synapse.handlers.presence import UserPresenceCache
@@ -257,7 +260,8 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
apple_set.add(self.u_potato.domain)
yield self.handlers.presence_handler.set_state(self.u_apple,
- self.u_apple, {"state": ONLINE})
+ self.u_apple, {"presence": ONLINE}
+ )
self.replication.send_edu.assert_called_with(
destination="remote",
@@ -266,7 +270,6 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
"push": [
{"user_id": "@apple:test",
"presence": "online",
- "state": "online",
"last_active_ago": 0,
"displayname": "Frank",
"avatar_url": "http://foo"},
@@ -283,18 +286,19 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
# TODO(paul): Gut-wrenching
potato_set = self.handlers.presence_handler._remote_recvmap.setdefault(
- self.u_potato, set())
+ self.u_potato, set()
+ )
potato_set.add(self.u_apple)
yield self.replication.received_edu(
- "remote", "m.presence", {
- "push": [
- {"user_id": "@potato:remote",
- "state": "online",
- "displayname": "Frank",
- "avatar_url": "http://foo"},
- ],
- }
+ "remote", "m.presence", {
+ "push": [
+ {"user_id": "@potato:remote",
+ "presence": "online",
+ "displayname": "Frank",
+ "avatar_url": "http://foo"},
+ ],
+ }
)
self.mock_update_client.assert_called_with(
@@ -313,7 +317,6 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
self.assertEquals(
{"presence": ONLINE,
- "state": ONLINE,
"displayname": "Frank",
"avatar_url": "http://foo"},
state)
|
