tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Federation test fixed!

Browse source
This commit is contained in:
Andrew Morgan 2019-03-20 10:50:44 +00:00
parent a8ad39eec7
commit 94cb7939e4
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/http/test_fedclient.py
View file

@ -278,6 +278,7 @@ class FederationClientTests(HomeserverTestCase):
"testserv:8008", "foo/bar", try_trailing_slash_on_400=True, "testserv:8008", "foo/bar", try_trailing_slash_on_400=True,
) )
# Send the request
self.pump() self.pump()
# there should have been a call to connectTCP # there should have been a call to connectTCP
@ -293,6 +294,9 @@ class FederationClientTests(HomeserverTestCase):
# that should have made it send the request to the connection # that should have made it send the request to the connection
self.assertRegex(conn.value(), b"^GET /foo/bar") self.assertRegex(conn.value(), b"^GET /foo/bar")
# Clear the original request data before sending a response
conn.clear()
# Send the HTTP response # Send the HTTP response
client.dataReceived( client.dataReceived(
b"HTTP/1.1 400 Bad Request\r\n" b"HTTP/1.1 400 Bad Request\r\n"
@ -302,7 +306,7 @@ class FederationClientTests(HomeserverTestCase):
b'{"errcode":"M_UNRECOGNIZED","error":"Unrecognized request"}' b'{"errcode":"M_UNRECOGNIZED","error":"Unrecognized request"}'
) )
# We should get another request wiht a trailing slash # We should get another request with a trailing slash
self.assertRegex(conn.value(), b"^GET /foo/bar/") self.assertRegex(conn.value(), b"^GET /foo/bar/")
# Send a happy response this time # Send a happy response this time
@ -316,7 +320,6 @@ class FederationClientTests(HomeserverTestCase):
# We should get a successful response # We should get a successful response
r = self.successResultOf(d) r = self.successResultOf(d)
self.assertEqual(r.code, 200)
self.assertEqual(r, {}) self.assertEqual(r, {})
def test_client_sends_body(self): def test_client_sends_body(self):