diff --git a/requirements/dev.txt b/requirements/dev.txt index 7eb5f73664c..4f7f2c3fdd1 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -165,7 +165,7 @@ pluggy==0.13.1 # pytest pre-commit==2.15.0 # via -r requirements/lint.txt -proxy.py==2.3.1 +proxy.py==3.4.0 # via -r requirements/test.txt py==1.10.0 # via diff --git a/requirements/test.txt b/requirements/test.txt index 70efaabe694..3ba126cec81 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -5,7 +5,7 @@ cryptography==3.3.1; platform_machine!="i686" and python_version<"3.9" # no 32-b freezegun==1.1.0 mypy==0.910; implementation_name=="cpython" mypy-extensions==0.4.3; implementation_name=="cpython" -proxy.py==2.3.1 +proxy.py==3.4.0 pytest==6.2.5 pytest-cov==3.0.0 pytest-mock==3.6.1 diff --git a/tests/test_proxy_functional.py b/tests/test_proxy_functional.py index ab3f5986ac9..2ccb87e75a1 100644 --- a/tests/test_proxy_functional.py +++ b/tests/test_proxy_functional.py @@ -35,7 +35,7 @@ @pytest.fixture -def secure_proxy_url(monkeypatch, tls_certificate_pem_path): +def secure_proxy_url(tls_certificate_pem_path): """Return the URL of an instance of a running secure proxy. This fixture also spawns that instance and tears it down after the test. @@ -54,18 +54,11 @@ def secure_proxy_url(monkeypatch, tls_certificate_pem_path): tls_certificate_pem_path, # contains both key and cert ] - class PatchedAccetorPool(proxy.core.acceptor.AcceptorPool): - def listen(self): - super().listen() - self.socket_host, self.socket_port = self.socket.getsockname()[:2] - - monkeypatch.setattr(proxy.proxy, "AcceptorPool", PatchedAccetorPool) - with proxy.Proxy(input_args=proxypy_args) as proxy_instance: yield URL.build( scheme="https", - host=proxy_instance.acceptors.socket_host, - port=proxy_instance.acceptors.socket_port, + host=proxy_instance.pool.flags.hostname, + port=proxy_instance.pool.flags.port, )