From 27dbc9ac423cbd4db04c9f78e56a6d28332fb5ec Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 6 Mar 2019 17:12:45 +0000 Subject: [PATCH] Reenable presence tests and remove pointless change --- synapse/federation/transaction_queue.py | 4 +--- tests/rest/client/v1/test_rooms.py | 12 +++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 698d4b4f87..e5e42c647d 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -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: diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py index 63d4b5eb00..015c144248 100644 --- a/tests/rest/client/v1/test_rooms.py +++ b/tests/rest/client/v1/test_rooms.py @@ -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):