mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-02 11:06:07 -04:00
Run Black on the tests again (#5170)
This commit is contained in:
Amber Brown
GitHub
parent
d9a02d1201
commit
b36c82576e
54 changed files with 818 additions and 1158 deletions
|
|
@ -24,14 +24,12 @@ def get_test_cert_file():
|
|||
#
|
||||
# openssl req -x509 -newkey rsa:4096 -keyout server.pem -out server.pem -days 36500 \
|
||||
# -nodes -subj '/CN=testserv'
|
||||
return os.path.join(
|
||||
os.path.dirname(__file__),
|
||||
'server.pem',
|
||||
)
|
||||
return os.path.join(os.path.dirname(__file__), 'server.pem')
|
||||
|
||||
|
||||
class ServerTLSContext(object):
|
||||
"""A TLS Context which presents our test cert."""
|
||||
|
||||
def __init__(self):
|
||||
self.filename = get_test_cert_file()
|
||||
|
||||
|
|
|
|||
|
|
@ -79,12 +79,12 @@ class MatrixFederationAgentTests(TestCase):
|
|||
# stubbing that out here.
|
||||
client_protocol = client_factory.buildProtocol(None)
|
||||
client_protocol.makeConnection(
|
||||
FakeTransport(server_tls_protocol, self.reactor, client_protocol),
|
||||
FakeTransport(server_tls_protocol, self.reactor, client_protocol)
|
||||
)
|
||||
|
||||
# tell the server tls protocol to send its stuff back to the client, too
|
||||
server_tls_protocol.makeConnection(
|
||||
FakeTransport(client_protocol, self.reactor, server_tls_protocol),
|
||||
FakeTransport(client_protocol, self.reactor, server_tls_protocol)
|
||||
)
|
||||
|
||||
# give the reactor a pump to get the TLS juices flowing.
|
||||
|
|
@ -125,7 +125,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
_check_logcontext(context)
|
||||
|
||||
def _handle_well_known_connection(
|
||||
self, client_factory, expected_sni, content, response_headers={},
|
||||
self, client_factory, expected_sni, content, response_headers={}
|
||||
):
|
||||
"""Handle an outgoing HTTPs connection: wire it up to a server, check that the
|
||||
request is for a .well-known, and send the response.
|
||||
|
|
@ -139,8 +139,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
"""
|
||||
# make the connection for .well-known
|
||||
well_known_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=expected_sni,
|
||||
client_factory, expected_sni=expected_sni
|
||||
)
|
||||
# check the .well-known request and send a response
|
||||
self.assertEqual(len(well_known_server.requests), 1)
|
||||
|
|
@ -154,17 +153,14 @@ class MatrixFederationAgentTests(TestCase):
|
|||
"""
|
||||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/.well-known/matrix/server')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'testserv'],
|
||||
)
|
||||
self.assertEqual(request.requestHeaders.getRawHeaders(b'host'), [b'testserv'])
|
||||
# send back a response
|
||||
for k, v in headers.items():
|
||||
request.setHeader(k, v)
|
||||
request.write(content)
|
||||
request.finish()
|
||||
|
||||
self.reactor.pump((0.1, ))
|
||||
self.reactor.pump((0.1,))
|
||||
|
||||
def test_get(self):
|
||||
"""
|
||||
|
|
@ -184,18 +180,14 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(port, 8448)
|
||||
|
||||
# make a test server, and wire up the client
|
||||
http_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=b"testserv",
|
||||
)
|
||||
http_server = self._make_connection(client_factory, expected_sni=b"testserv")
|
||||
|
||||
self.assertEqual(len(http_server.requests), 1)
|
||||
request = http_server.requests[0]
|
||||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/foo/bar')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'testserv:8448']
|
||||
request.requestHeaders.getRawHeaders(b'host'), [b'testserv:8448']
|
||||
)
|
||||
content = request.content.read()
|
||||
self.assertEqual(content, b'')
|
||||
|
|
@ -244,19 +236,13 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(port, 8448)
|
||||
|
||||
# make a test server, and wire up the client
|
||||
http_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=None,
|
||||
)
|
||||
http_server = self._make_connection(client_factory, expected_sni=None)
|
||||
|
||||
self.assertEqual(len(http_server.requests), 1)
|
||||
request = http_server.requests[0]
|
||||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/foo/bar')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'1.2.3.4'],
|
||||
)
|
||||
self.assertEqual(request.requestHeaders.getRawHeaders(b'host'), [b'1.2.3.4'])
|
||||
|
||||
# finish the request
|
||||
request.finish()
|
||||
|
|
@ -285,19 +271,13 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(port, 8448)
|
||||
|
||||
# make a test server, and wire up the client
|
||||
http_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=None,
|
||||
)
|
||||
http_server = self._make_connection(client_factory, expected_sni=None)
|
||||
|
||||
self.assertEqual(len(http_server.requests), 1)
|
||||
request = http_server.requests[0]
|
||||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/foo/bar')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'[::1]'],
|
||||
)
|
||||
self.assertEqual(request.requestHeaders.getRawHeaders(b'host'), [b'[::1]'])
|
||||
|
||||
# finish the request
|
||||
request.finish()
|
||||
|
|
@ -326,19 +306,13 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(port, 80)
|
||||
|
||||
# make a test server, and wire up the client
|
||||
http_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=None,
|
||||
)
|
||||
http_server = self._make_connection(client_factory, expected_sni=None)
|
||||
|
||||
self.assertEqual(len(http_server.requests), 1)
|
||||
request = http_server.requests[0]
|
||||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/foo/bar')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'[::1]:80'],
|
||||
)
|
||||
self.assertEqual(request.requestHeaders.getRawHeaders(b'host'), [b'[::1]:80'])
|
||||
|
||||
# finish the request
|
||||
request.finish()
|
||||
|
|
@ -377,7 +351,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
|
||||
# now there should be a SRV lookup
|
||||
self.mock_resolver.resolve_service.assert_called_once_with(
|
||||
b"_matrix._tcp.testserv",
|
||||
b"_matrix._tcp.testserv"
|
||||
)
|
||||
|
||||
# we should fall back to a direct connection
|
||||
|
|
@ -387,19 +361,13 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(port, 8448)
|
||||
|
||||
# make a test server, and wire up the client
|
||||
http_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=b'testserv',
|
||||
)
|
||||
http_server = self._make_connection(client_factory, expected_sni=b'testserv')
|
||||
|
||||
self.assertEqual(len(http_server.requests), 1)
|
||||
request = http_server.requests[0]
|
||||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/foo/bar')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'testserv'],
|
||||
)
|
||||
self.assertEqual(request.requestHeaders.getRawHeaders(b'host'), [b'testserv'])
|
||||
|
||||
# finish the request
|
||||
request.finish()
|
||||
|
|
@ -427,13 +395,14 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(port, 443)
|
||||
|
||||
self._handle_well_known_connection(
|
||||
client_factory, expected_sni=b"testserv",
|
||||
client_factory,
|
||||
expected_sni=b"testserv",
|
||||
content=b'{ "m.server": "target-server" }',
|
||||
)
|
||||
|
||||
# there should be a SRV lookup
|
||||
self.mock_resolver.resolve_service.assert_called_once_with(
|
||||
b"_matrix._tcp.target-server",
|
||||
b"_matrix._tcp.target-server"
|
||||
)
|
||||
|
||||
# now we should get a connection to the target server
|
||||
|
|
@ -444,8 +413,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
|
||||
# make a test server, and wire up the client
|
||||
http_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=b'target-server',
|
||||
client_factory, expected_sni=b'target-server'
|
||||
)
|
||||
|
||||
self.assertEqual(len(http_server.requests), 1)
|
||||
|
|
@ -453,8 +421,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/foo/bar')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'target-server'],
|
||||
request.requestHeaders.getRawHeaders(b'host'), [b'target-server']
|
||||
)
|
||||
|
||||
# finish the request
|
||||
|
|
@ -490,8 +457,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(port, 443)
|
||||
|
||||
redirect_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=b"testserv",
|
||||
client_factory, expected_sni=b"testserv"
|
||||
)
|
||||
|
||||
# send a 302 redirect
|
||||
|
|
@ -500,7 +466,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
request.redirect(b'https://testserv/even_better_known')
|
||||
request.finish()
|
||||
|
||||
self.reactor.pump((0.1, ))
|
||||
self.reactor.pump((0.1,))
|
||||
|
||||
# now there should be another connection
|
||||
clients = self.reactor.tcpClients
|
||||
|
|
@ -510,8 +476,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(port, 443)
|
||||
|
||||
well_known_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=b"testserv",
|
||||
client_factory, expected_sni=b"testserv"
|
||||
)
|
||||
|
||||
self.assertEqual(len(well_known_server.requests), 1, "No request after 302")
|
||||
|
|
@ -521,11 +486,11 @@ class MatrixFederationAgentTests(TestCase):
|
|||
request.write(b'{ "m.server": "target-server" }')
|
||||
request.finish()
|
||||
|
||||
self.reactor.pump((0.1, ))
|
||||
self.reactor.pump((0.1,))
|
||||
|
||||
# there should be a SRV lookup
|
||||
self.mock_resolver.resolve_service.assert_called_once_with(
|
||||
b"_matrix._tcp.target-server",
|
||||
b"_matrix._tcp.target-server"
|
||||
)
|
||||
|
||||
# now we should get a connection to the target server
|
||||
|
|
@ -536,8 +501,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
|
||||
# make a test server, and wire up the client
|
||||
http_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=b'target-server',
|
||||
client_factory, expected_sni=b'target-server'
|
||||
)
|
||||
|
||||
self.assertEqual(len(http_server.requests), 1)
|
||||
|
|
@ -545,8 +509,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/foo/bar')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'target-server'],
|
||||
request.requestHeaders.getRawHeaders(b'host'), [b'target-server']
|
||||
)
|
||||
|
||||
# finish the request
|
||||
|
|
@ -585,12 +548,12 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(port, 443)
|
||||
|
||||
self._handle_well_known_connection(
|
||||
client_factory, expected_sni=b"testserv", content=b'NOT JSON',
|
||||
client_factory, expected_sni=b"testserv", content=b'NOT JSON'
|
||||
)
|
||||
|
||||
# now there should be a SRV lookup
|
||||
self.mock_resolver.resolve_service.assert_called_once_with(
|
||||
b"_matrix._tcp.testserv",
|
||||
b"_matrix._tcp.testserv"
|
||||
)
|
||||
|
||||
# we should fall back to a direct connection
|
||||
|
|
@ -600,19 +563,13 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(port, 8448)
|
||||
|
||||
# make a test server, and wire up the client
|
||||
http_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=b'testserv',
|
||||
)
|
||||
http_server = self._make_connection(client_factory, expected_sni=b'testserv')
|
||||
|
||||
self.assertEqual(len(http_server.requests), 1)
|
||||
request = http_server.requests[0]
|
||||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/foo/bar')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'testserv'],
|
||||
)
|
||||
self.assertEqual(request.requestHeaders.getRawHeaders(b'host'), [b'testserv'])
|
||||
|
||||
# finish the request
|
||||
request.finish()
|
||||
|
|
@ -635,7 +592,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
|
||||
# the request for a .well-known will have failed with a DNS lookup error.
|
||||
self.mock_resolver.resolve_service.assert_called_once_with(
|
||||
b"_matrix._tcp.testserv",
|
||||
b"_matrix._tcp.testserv"
|
||||
)
|
||||
|
||||
# Make sure treq is trying to connect
|
||||
|
|
@ -646,19 +603,13 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(port, 8443)
|
||||
|
||||
# make a test server, and wire up the client
|
||||
http_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=b'testserv',
|
||||
)
|
||||
http_server = self._make_connection(client_factory, expected_sni=b'testserv')
|
||||
|
||||
self.assertEqual(len(http_server.requests), 1)
|
||||
request = http_server.requests[0]
|
||||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/foo/bar')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'testserv'],
|
||||
)
|
||||
self.assertEqual(request.requestHeaders.getRawHeaders(b'host'), [b'testserv'])
|
||||
|
||||
# finish the request
|
||||
request.finish()
|
||||
|
|
@ -685,17 +636,18 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(port, 443)
|
||||
|
||||
self.mock_resolver.resolve_service.side_effect = lambda _: [
|
||||
Server(host=b"srvtarget", port=8443),
|
||||
Server(host=b"srvtarget", port=8443)
|
||||
]
|
||||
|
||||
self._handle_well_known_connection(
|
||||
client_factory, expected_sni=b"testserv",
|
||||
client_factory,
|
||||
expected_sni=b"testserv",
|
||||
content=b'{ "m.server": "target-server" }',
|
||||
)
|
||||
|
||||
# there should be a SRV lookup
|
||||
self.mock_resolver.resolve_service.assert_called_once_with(
|
||||
b"_matrix._tcp.target-server",
|
||||
b"_matrix._tcp.target-server"
|
||||
)
|
||||
|
||||
# now we should get a connection to the target of the SRV record
|
||||
|
|
@ -706,8 +658,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
|
||||
# make a test server, and wire up the client
|
||||
http_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=b'target-server',
|
||||
client_factory, expected_sni=b'target-server'
|
||||
)
|
||||
|
||||
self.assertEqual(len(http_server.requests), 1)
|
||||
|
|
@ -715,8 +666,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/foo/bar')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'target-server'],
|
||||
request.requestHeaders.getRawHeaders(b'host'), [b'target-server']
|
||||
)
|
||||
|
||||
# finish the request
|
||||
|
|
@ -757,7 +707,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
|
||||
# now there should have been a SRV lookup
|
||||
self.mock_resolver.resolve_service.assert_called_once_with(
|
||||
b"_matrix._tcp.xn--bcher-kva.com",
|
||||
b"_matrix._tcp.xn--bcher-kva.com"
|
||||
)
|
||||
|
||||
# We should fall back to port 8448
|
||||
|
|
@ -769,8 +719,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
|
||||
# make a test server, and wire up the client
|
||||
http_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=b'xn--bcher-kva.com',
|
||||
client_factory, expected_sni=b'xn--bcher-kva.com'
|
||||
)
|
||||
|
||||
self.assertEqual(len(http_server.requests), 1)
|
||||
|
|
@ -778,8 +727,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/foo/bar')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'xn--bcher-kva.com'],
|
||||
request.requestHeaders.getRawHeaders(b'host'), [b'xn--bcher-kva.com']
|
||||
)
|
||||
|
||||
# finish the request
|
||||
|
|
@ -801,7 +749,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertNoResult(test_d)
|
||||
|
||||
self.mock_resolver.resolve_service.assert_called_once_with(
|
||||
b"_matrix._tcp.xn--bcher-kva.com",
|
||||
b"_matrix._tcp.xn--bcher-kva.com"
|
||||
)
|
||||
|
||||
# Make sure treq is trying to connect
|
||||
|
|
@ -813,8 +761,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
|
||||
# make a test server, and wire up the client
|
||||
http_server = self._make_connection(
|
||||
client_factory,
|
||||
expected_sni=b'xn--bcher-kva.com',
|
||||
client_factory, expected_sni=b'xn--bcher-kva.com'
|
||||
)
|
||||
|
||||
self.assertEqual(len(http_server.requests), 1)
|
||||
|
|
@ -822,8 +769,7 @@ class MatrixFederationAgentTests(TestCase):
|
|||
self.assertEqual(request.method, b'GET')
|
||||
self.assertEqual(request.path, b'/foo/bar')
|
||||
self.assertEqual(
|
||||
request.requestHeaders.getRawHeaders(b'host'),
|
||||
[b'xn--bcher-kva.com'],
|
||||
request.requestHeaders.getRawHeaders(b'host'), [b'xn--bcher-kva.com']
|
||||
)
|
||||
|
||||
# finish the request
|
||||
|
|
@ -897,67 +843,70 @@ class TestCachePeriodFromHeaders(TestCase):
|
|||
# uppercase
|
||||
self.assertEqual(
|
||||
_cache_period_from_headers(
|
||||
Headers({b'Cache-Control': [b'foo, Max-Age = 100, bar']}),
|
||||
), 100,
|
||||
Headers({b'Cache-Control': [b'foo, Max-Age = 100, bar']})
|
||||
),
|
||||
100,
|
||||
)
|
||||
|
||||
# missing value
|
||||
self.assertIsNone(_cache_period_from_headers(
|
||||
Headers({b'Cache-Control': [b'max-age=, bar']}),
|
||||
))
|
||||
self.assertIsNone(
|
||||
_cache_period_from_headers(Headers({b'Cache-Control': [b'max-age=, bar']}))
|
||||
)
|
||||
|
||||
# hackernews: bogus due to semicolon
|
||||
self.assertIsNone(_cache_period_from_headers(
|
||||
Headers({b'Cache-Control': [b'private; max-age=0']}),
|
||||
))
|
||||
self.assertIsNone(
|
||||
_cache_period_from_headers(
|
||||
Headers({b'Cache-Control': [b'private; max-age=0']})
|
||||
)
|
||||
)
|
||||
|
||||
# github
|
||||
self.assertEqual(
|
||||
_cache_period_from_headers(
|
||||
Headers({b'Cache-Control': [b'max-age=0, private, must-revalidate']}),
|
||||
), 0,
|
||||
Headers({b'Cache-Control': [b'max-age=0, private, must-revalidate']})
|
||||
),
|
||||
0,
|
||||
)
|
||||
|
||||
# google
|
||||
self.assertEqual(
|
||||
_cache_period_from_headers(
|
||||
Headers({b'cache-control': [b'private, max-age=0']}),
|
||||
), 0,
|
||||
Headers({b'cache-control': [b'private, max-age=0']})
|
||||
),
|
||||
0,
|
||||
)
|
||||
|
||||
def test_expires(self):
|
||||
self.assertEqual(
|
||||
_cache_period_from_headers(
|
||||
Headers({b'Expires': [b'Wed, 30 Jan 2019 07:35:33 GMT']}),
|
||||
time_now=lambda: 1548833700
|
||||
), 33,
|
||||
time_now=lambda: 1548833700,
|
||||
),
|
||||
33,
|
||||
)
|
||||
|
||||
# cache-control overrides expires
|
||||
self.assertEqual(
|
||||
_cache_period_from_headers(
|
||||
Headers({
|
||||
b'cache-control': [b'max-age=10'],
|
||||
b'Expires': [b'Wed, 30 Jan 2019 07:35:33 GMT']
|
||||
}),
|
||||
time_now=lambda: 1548833700
|
||||
), 10,
|
||||
Headers(
|
||||
{
|
||||
b'cache-control': [b'max-age=10'],
|
||||
b'Expires': [b'Wed, 30 Jan 2019 07:35:33 GMT'],
|
||||
}
|
||||
),
|
||||
time_now=lambda: 1548833700,
|
||||
),
|
||||
10,
|
||||
)
|
||||
|
||||
# invalid expires means immediate expiry
|
||||
self.assertEqual(
|
||||
_cache_period_from_headers(
|
||||
Headers({b'Expires': [b'0']}),
|
||||
), 0,
|
||||
)
|
||||
self.assertEqual(_cache_period_from_headers(Headers({b'Expires': [b'0']})), 0)
|
||||
|
||||
|
||||
def _check_logcontext(context):
|
||||
current = LoggingContext.current_context()
|
||||
if current is not context:
|
||||
raise AssertionError(
|
||||
"Expected logcontext %s but was %s" % (context, current),
|
||||
)
|
||||
raise AssertionError("Expected logcontext %s but was %s" % (context, current))
|
||||
|
||||
|
||||
def _build_test_server():
|
||||
|
|
@ -973,7 +922,7 @@ def _build_test_server():
|
|||
server_factory.log = _log_request
|
||||
|
||||
server_tls_factory = TLSMemoryBIOFactory(
|
||||
ServerTLSContext(), isClient=False, wrappedFactory=server_factory,
|
||||
ServerTLSContext(), isClient=False, wrappedFactory=server_factory
|
||||
)
|
||||
|
||||
return server_tls_factory.buildProtocol(None)
|
||||
|
|
@ -987,6 +936,7 @@ def _log_request(request):
|
|||
@implementer(IPolicyForHTTPS)
|
||||
class TrustingTLSPolicyForHTTPS(object):
|
||||
"""An IPolicyForHTTPS which doesn't do any certificate verification"""
|
||||
|
||||
def creatorForNetloc(self, hostname, port):
|
||||
certificateOptions = OpenSSLCertificateOptions()
|
||||
return ClientTLSOptions(hostname, certificateOptions.getContext())
|
||||
|
|
|
|||
|
|
@ -68,9 +68,7 @@ class SrvResolverTestCase(unittest.TestCase):
|
|||
|
||||
dns_client_mock.lookupService.assert_called_once_with(service_name)
|
||||
|
||||
result_deferred.callback(
|
||||
([answer_srv], None, None)
|
||||
)
|
||||
result_deferred.callback(([answer_srv], None, None))
|
||||
|
||||
servers = self.successResultOf(test_d)
|
||||
|
||||
|
|
@ -112,7 +110,7 @@ class SrvResolverTestCase(unittest.TestCase):
|
|||
|
||||
cache = {service_name: [entry]}
|
||||
resolver = SrvResolver(
|
||||
dns_client=dns_client_mock, cache=cache, get_time=clock.time,
|
||||
dns_client=dns_client_mock, cache=cache, get_time=clock.time
|
||||
)
|
||||
|
||||
servers = yield resolver.resolve_service(service_name)
|
||||
|
|
@ -168,11 +166,13 @@ class SrvResolverTestCase(unittest.TestCase):
|
|||
self.assertNoResult(resolve_d)
|
||||
|
||||
# returning a single "." should make the lookup fail with a ConenctError
|
||||
lookup_deferred.callback((
|
||||
[dns.RRHeader(type=dns.SRV, payload=dns.Record_SRV(target=b"."))],
|
||||
None,
|
||||
None,
|
||||
))
|
||||
lookup_deferred.callback(
|
||||
(
|
||||
[dns.RRHeader(type=dns.SRV, payload=dns.Record_SRV(target=b"."))],
|
||||
None,
|
||||
None,
|
||||
)
|
||||
)
|
||||
|
||||
self.failureResultOf(resolve_d, ConnectError)
|
||||
|
||||
|
|
@ -191,14 +191,16 @@ class SrvResolverTestCase(unittest.TestCase):
|
|||
resolve_d = resolver.resolve_service(service_name)
|
||||
self.assertNoResult(resolve_d)
|
||||
|
||||
lookup_deferred.callback((
|
||||
[
|
||||
dns.RRHeader(type=dns.A, payload=dns.Record_A()),
|
||||
dns.RRHeader(type=dns.SRV, payload=dns.Record_SRV(target=b"host")),
|
||||
],
|
||||
None,
|
||||
None,
|
||||
))
|
||||
lookup_deferred.callback(
|
||||
(
|
||||
[
|
||||
dns.RRHeader(type=dns.A, payload=dns.Record_A()),
|
||||
dns.RRHeader(type=dns.SRV, payload=dns.Record_SRV(target=b"host")),
|
||||
],
|
||||
None,
|
||||
None,
|
||||
)
|
||||
)
|
||||
|
||||
servers = self.successResultOf(resolve_d)
|
||||
|
||||
|
|
|
|||
|
|
@ -36,9 +36,7 @@ from tests.unittest import HomeserverTestCase
|
|||
def check_logcontext(context):
|
||||
current = LoggingContext.current_context()
|
||||
if current is not context:
|
||||
raise AssertionError(
|
||||
"Expected logcontext %s but was %s" % (context, current),
|
||||
)
|
||||
raise AssertionError("Expected logcontext %s but was %s" % (context, current))
|
||||
|
||||
|
||||
class FederationClientTests(HomeserverTestCase):
|
||||
|
|
@ -54,6 +52,7 @@ class FederationClientTests(HomeserverTestCase):
|
|||
"""
|
||||
happy-path test of a GET request
|
||||
"""
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def do_request():
|
||||
with LoggingContext("one") as context:
|
||||
|
|
@ -175,8 +174,7 @@ class FederationClientTests(HomeserverTestCase):
|
|||
|
||||
self.assertIsInstance(f.value, RequestSendFailed)
|
||||
self.assertIsInstance(
|
||||
f.value.inner_exception,
|
||||
(ConnectingCancelledError, TimeoutError),
|
||||
f.value.inner_exception, (ConnectingCancelledError, TimeoutError)
|
||||
)
|
||||
|
||||
def test_client_connect_no_response(self):
|
||||
|
|
@ -216,9 +214,7 @@ class FederationClientTests(HomeserverTestCase):
|
|||
Once the client gets the headers, _request returns successfully.
|
||||
"""
|
||||
request = MatrixFederationRequest(
|
||||
method="GET",
|
||||
destination="testserv:8008",
|
||||
path="foo/bar",
|
||||
method="GET", destination="testserv:8008", path="foo/bar"
|
||||
)
|
||||
d = self.cl._send_request(request, timeout=10000)
|
||||
|
||||
|
|
@ -258,8 +254,10 @@ class FederationClientTests(HomeserverTestCase):
|
|||
|
||||
# Send it the HTTP response
|
||||
client.dataReceived(
|
||||
(b"HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n"
|
||||
b"Server: Fake\r\n\r\n")
|
||||
(
|
||||
b"HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n"
|
||||
b"Server: Fake\r\n\r\n"
|
||||
)
|
||||
)
|
||||
|
||||
# Push by enough to time it out
|
||||
|
|
@ -274,9 +272,7 @@ class FederationClientTests(HomeserverTestCase):
|
|||
requiring a trailing slash. We need to retry the request with a
|
||||
trailing slash. Workaround for Synapse <= v0.99.3, explained in #3622.
|
||||
"""
|
||||
d = self.cl.get_json(
|
||||
"testserv:8008", "foo/bar", try_trailing_slash_on_400=True,
|
||||
)
|
||||
d = self.cl.get_json("testserv:8008", "foo/bar", try_trailing_slash_on_400=True)
|
||||
|
||||
# Send the request
|
||||
self.pump()
|
||||
|
|
@ -329,9 +325,7 @@ class FederationClientTests(HomeserverTestCase):
|
|||
|
||||
See test_client_requires_trailing_slashes() for context.
|
||||
"""
|
||||
d = self.cl.get_json(
|
||||
"testserv:8008", "foo/bar", try_trailing_slash_on_400=True,
|
||||
)
|
||||
d = self.cl.get_json("testserv:8008", "foo/bar", try_trailing_slash_on_400=True)
|
||||
|
||||
# Send the request
|
||||
self.pump()
|
||||
|
|
@ -368,10 +362,7 @@ class FederationClientTests(HomeserverTestCase):
|
|||
self.failureResultOf(d)
|
||||
|
||||
def test_client_sends_body(self):
|
||||
self.cl.post_json(
|
||||
"testserv:8008", "foo/bar", timeout=10000,
|
||||
data={"a": "b"}
|
||||
)
|
||||
self.cl.post_json("testserv:8008", "foo/bar", timeout=10000, data={"a": "b"})
|
||||
|
||||
self.pump()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue