From a82006954912ed96b0d47db43db44e76e5b052d6 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Mon, 16 Dec 2019 16:00:18 +0000
Subject: [PATCH] Incorporate review
---
synapse/handlers/room.py | 2 +-
tests/rest/client/v1/test_rooms.py | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 7f979e5812..60b8bbc7a5 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -941,7 +941,7 @@ class RoomContextHandler(object):
if event_filter:
state_events = event_filter.filter(state_events)
- results["state"] = state_events
+ results["state"] = yield filter_evts(state_events)
# We use a dummy token here as we only care about the room portion of
# the token, which we replace.
diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py
index dca0fef97a..e3af280ba6 100644
--- a/tests/rest/client/v1/test_rooms.py
+++ b/tests/rest/client/v1/test_rooms.py
@@ -1609,11 +1609,6 @@ class ContextTestCase(unittest.HomeserverTestCase):
account.register_servlets,
]
- def make_homeserver(self, reactor, clock):
- self.hs = self.setup_test_homeserver()
-
- return self.hs
-
def prepare(self, reactor, clock, homeserver):
self.user_id = self.register_user("user", "password")
self.tok = self.login("user", "password")
--
GitLab