OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Reenable presence tests and remove pointless change

matrix-org-hotfixes-identity
Erik Johnston 2019-03-06 17:12:45 +00:00
parent e9aa401994
commit 27dbc9ac42
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/federation/transaction_queue.py
View File

@ -397,9 +397,7 @@ class TransactionQueue(object):
else:
self.pending_edus_by_dest.setdefault(edu.destination, []).append(edu)
destination = edu.destination
self._attempt_new_transaction(destination)
self._attempt_new_transaction(edu.destination)
def send_device_messages(self, destination):
if destination == self.server_name:

12
tests/rest/client/v1/test_rooms.py
View File

@ -761,13 +761,11 @@ class RoomInitialSyncTestCase(RoomBase):
self.assertTrue("presence" in channel.json_body)
# presence is turned off on hotfixes
# presence_by_user = {
# e["content"]["user_id"]: e for e in channel.json_body["presence"]
# }
# self.assertTrue(self.user_id in presence_by_user)
# self.assertEquals("m.presence", presence_by_user[self.user_id]["type"])
presence_by_user = {
e["content"]["user_id"]: e for e in channel.json_body["presence"]
}
self.assertTrue(self.user_id in presence_by_user)
self.assertEquals("m.presence", presence_by_user[self.user_id]["type"])
class RoomMessageListTestCase(RoomBase):