|
@@ -43,7 +43,6 @@ from tests.http import (
|
|
|
)
|
|
|
from tests.server import FakeTransport, ThreadedMemoryReactorClock
|
|
|
from tests.unittest import TestCase
|
|
|
-from tests.utils import checked_cast
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
@@ -645,7 +644,8 @@ class MatrixFederationAgentTests(TestCase):
|
|
|
assert isinstance(proxy_server_transport, FakeTransport)
|
|
|
client_protocol = proxy_server_transport.other
|
|
|
assert isinstance(client_protocol, Protocol)
|
|
|
- c2s_transport = checked_cast(FakeTransport, client_protocol.transport)
|
|
|
+ c2s_transport = client_protocol.transport
|
|
|
+ assert isinstance(c2s_transport, FakeTransport)
|
|
|
c2s_transport.other = server_ssl_protocol
|
|
|
|
|
|
self.reactor.advance(0)
|
|
@@ -763,9 +763,12 @@ class MatrixFederationAgentTests(TestCase):
|
|
|
# https://github.com/Shoobx/mypy-zope/issues/91 .
|
|
|
# We also double-checked these casts at runtime (test-time) because I found it
|
|
|
# quite confusing to deduce these types in the first place!
|
|
|
- s2c_transport = checked_cast(FakeTransport, proxy_server.transport)
|
|
|
- client_protocol = checked_cast(_WrappingProtocol, s2c_transport.other)
|
|
|
- c2s_transport = checked_cast(FakeTransport, client_protocol.transport)
|
|
|
+ s2c_transport = proxy_server.transport
|
|
|
+ assert isinstance(s2c_transport, FakeTransport)
|
|
|
+ client_protocol = s2c_transport.other
|
|
|
+ assert isinstance(client_protocol, _WrappingProtocol)
|
|
|
+ c2s_transport = client_protocol.transport
|
|
|
+ assert isinstance(c2s_transport, FakeTransport)
|
|
|
|
|
|
# the FakeTransport is async, so we need to pump the reactor
|
|
|
self.reactor.advance(0)
|
|
@@ -825,7 +828,8 @@ class MatrixFederationAgentTests(TestCase):
|
|
|
@patch.dict(os.environ, {"http_proxy": "proxy.com:8888"})
|
|
|
def test_proxy_with_no_scheme(self) -> None:
|
|
|
http_proxy_agent = ProxyAgent(self.reactor, use_proxy=True)
|
|
|
- proxy_ep = checked_cast(HostnameEndpoint, http_proxy_agent.http_proxy_endpoint)
|
|
|
+ proxy_ep = http_proxy_agent.http_proxy_endpoint
|
|
|
+ assert isinstance(proxy_ep, HostnameEndpoint)
|
|
|
self.assertEqual(proxy_ep._hostStr, "proxy.com")
|
|
|
self.assertEqual(proxy_ep._port, 8888)
|
|
|
|
|
@@ -837,14 +841,16 @@ class MatrixFederationAgentTests(TestCase):
|
|
|
@patch.dict(os.environ, {"http_proxy": "http://proxy.com:8888"})
|
|
|
def test_proxy_with_http_scheme(self) -> None:
|
|
|
http_proxy_agent = ProxyAgent(self.reactor, use_proxy=True)
|
|
|
- proxy_ep = checked_cast(HostnameEndpoint, http_proxy_agent.http_proxy_endpoint)
|
|
|
+ proxy_ep = http_proxy_agent.http_proxy_endpoint
|
|
|
+ assert isinstance(proxy_ep, HostnameEndpoint)
|
|
|
self.assertEqual(proxy_ep._hostStr, "proxy.com")
|
|
|
self.assertEqual(proxy_ep._port, 8888)
|
|
|
|
|
|
@patch.dict(os.environ, {"http_proxy": "https://proxy.com:8888"})
|
|
|
def test_proxy_with_https_scheme(self) -> None:
|
|
|
https_proxy_agent = ProxyAgent(self.reactor, use_proxy=True)
|
|
|
- proxy_ep = checked_cast(_WrapperEndpoint, https_proxy_agent.http_proxy_endpoint)
|
|
|
+ proxy_ep = https_proxy_agent.http_proxy_endpoint
|
|
|
+ assert isinstance(proxy_ep, _WrapperEndpoint)
|
|
|
self.assertEqual(proxy_ep._wrappedEndpoint._hostStr, "proxy.com")
|
|
|
self.assertEqual(proxy_ep._wrappedEndpoint._port, 8888)
|
|
|
|