summary refs log tree commit diff
path: root/tests/test_federation.py
diff options
context:
space:
mode:
authorTravis Ralston <travpc@gmail.com>2018-11-27 14:04:22 -0700
committerTravis Ralston <travpc@gmail.com>2018-11-27 14:04:22 -0700
commitbc50cffa2698a484dffda0e1f64c832132b1ff48 (patch)
tree401ed265c319a277506cb4ddfe9c12bbcb0d4716 /tests/test_federation.py
parentMore timeout (diff)
parentSupport m.login.sso (#4220) (diff)
downloadsynapse-travis/intentional-timeout.tar.xz
Merge branch 'develop' into travis/intentional-timeout github/travis/intentional-timeout travis/intentional-timeout
Diffstat (limited to '')
-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)