diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-25 03:10:01 +1000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-25 03:10:01 +1000 |
| commit | fbe5ba25f6255db15a69687c0baa0b4ced64fec2 (patch) | |
| tree | 0277c54551b40cd14402b43ad379346bc97e4780 /tests/http | |
| parent | Merge branch 'master' into develop (diff) | |
| parent | Merge tag 'v0.33.5.1' (diff) | |
| download | synapse-fbe5ba25f6255db15a69687c0baa0b4ced64fec2.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'tests/http')
| -rw-r--r-- | tests/http/test_fedclient.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/http/test_fedclient.py b/tests/http/test_fedclient.py index 66c09f63b6..f3cb1423f0 100644 --- a/tests/http/test_fedclient.py +++ b/tests/http/test_fedclient.py @@ -54,7 +54,7 @@ class FederationClientTests(HomeserverTestCase): def test_client_never_connect(self): """ If the HTTP request is not connected and is timed out, it'll give a - ConnectingCancelledError. + ConnectingCancelledError or TimeoutError. """ d = self.cl.get_json("testserv:8008", "foo/bar", timeout=10000) @@ -76,7 +76,7 @@ class FederationClientTests(HomeserverTestCase): self.reactor.advance(10.5) f = self.failureResultOf(d) - self.assertIsInstance(f.value, ConnectingCancelledError) + self.assertIsInstance(f.value, (ConnectingCancelledError, TimeoutError)) def test_client_connect_no_response(self): """ |