summary refs log tree commit diff
path: root/tests/test_federation.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-11-20 11:29:45 +0000
committerRichard van der Hoff <richard@matrix.org>2018-11-20 11:29:45 +0000
commit3dd704ee9af836b9b3e50daf1017a3d65c9ebaec (patch)
tree6f69b034a56669cb0512e76c87b71789d0b8b3db /tests/test_federation.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentRemove riot.im from the list of trusted Identity Servers in the default confi... (diff)
downloadsynapse-3dd704ee9af836b9b3e50daf1017a3d65c9ebaec.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/test_federation.py')
-rw-r--r--tests/test_federation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_federation.py b/tests/test_federation.py

index e1a34ccffd..1a5dc32c88 100644 --- a/tests/test_federation.py +++ b/tests/test_federation.py
@@ -123,8 +123,8 @@ class MessageAcceptTests(unittest.TestCase): "test.serv", lying_event, sent_to_us_directly=True ) - # Step the reactor, so the database fetches come back - self.reactor.advance(1) + # Step the reactor, so the database fetches come back + self.reactor.advance(1) # on_receive_pdu should throw an error failure = self.failureResultOf(d)