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

Fix compatibility issue with older Twisted in tests. 

Older Twisted (18.4.0) returns TimeoutError instead of
ConnectingCancelledError when connection times out.
This change allows tests to be compatible with this behaviour.

Signed-off-by: Oleg Girko <ol@infoserver.lv>
release-v0.33.5.1
Oleg Girko 2018-09-24 16:51:59 +01:00 committed by Amber Brown
parent e3aa2c0b75
commit 7d3f639844
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/http/test_fedclient.py
View File

@ -49,7 +49,7 @@ class FederationClientTests(HomeserverTestCase):
def test_client_never_connect(self): def test_client_never_connect(self):
""" """
If the HTTP request is not connected and is timed out, it'll give a If the HTTP request is not connected and is timed out, it'll give a
ConnectingCancelledError. ConnectingCancelledError or TimeoutError.
""" """
d = self.cl._request("testserv:8008", "GET", "foo/bar", timeout=10000) d = self.cl._request("testserv:8008", "GET", "foo/bar", timeout=10000)
@ -71,7 +71,7 @@ class FederationClientTests(HomeserverTestCase):
self.reactor.advance(10.5) self.reactor.advance(10.5)
f = self.failureResultOf(d) f = self.failureResultOf(d)
self.assertIsInstance(f.value, ConnectingCancelledError) self.assertIsInstance(f.value, (ConnectingCancelledError, TimeoutError))
def test_client_connect_no_response(self): def test_client_connect_no_response(self):
""" """