diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-09-25 12:03:54 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-09-25 12:03:54 +0100 |
| commit | a1cd37390f35ff814be2d2e1428af83b852c5d2a (patch) | |
| tree | 56617045f76b6ba1c4deb60a2c48e0f3c663f178 /tests/http | |
| parent | Fix ExpiringCache.__len__ to be accurate (diff) | |
| parent | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches (diff) | |
| download | synapse-a1cd37390f35ff814be2d2e1428af83b852c5d2a.tar.xz | |
Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache
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): """ |