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

Incorporate review

pull/6553/head
Brendan Abolivier 2019-12-16 16:00:18 +00:00
parent a29420f9f4
commit a820069549
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/handlers/room.py
View File

@ -941,7 +941,7 @@ class RoomContextHandler(object):
if event_filter: if event_filter:
state_events = event_filter.filter(state_events) 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 # We use a dummy token here as we only care about the room portion of
# the token, which we replace. # the token, which we replace.

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

@ -1609,11 +1609,6 @@ class ContextTestCase(unittest.HomeserverTestCase):
account.register_servlets, account.register_servlets,
] ]
def make_homeserver(self, reactor, clock):
self.hs = self.setup_test_homeserver()
return self.hs
def prepare(self, reactor, clock, homeserver): def prepare(self, reactor, clock, homeserver):
self.user_id = self.register_user("user", "password") self.user_id = self.register_user("user", "password")
self.tok = self.login("user", "password") self.tok = self.login("user", "password")