Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PR #6380/674948f5 backport][3.9] Bump proxy.py to v2.4.0 pre-release #6382

Merged
merged 1 commit into from
Dec 5, 2021
Merged

[PR #6380/674948f5 backport][3.9] Bump proxy.py to v2.4.0 pre-release #6382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ pluggy==1.0.0
# via pytest
pre-commit==2.16.0
# via -r requirements/lint.txt
proxy.py==2.3.1
proxy.py==2.4.0rc2
# via -r requirements/test.txt
py==1.11.0
# via pytest
Expand Down Expand Up @@ -238,7 +238,6 @@ typing-extensions==3.7.4.3
# -r requirements/typing-extensions.txt
# async-timeout
# mypy
# proxy.py
# pydantic
uritemplate==4.1.1
# via gidgethub
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cryptography==36.0.0; platform_machine!="i686" # no 32-bit wheels; no python 3.9
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 ~= 2.4.0a2
pytest==6.2.5
pytest-cov==3.0.0
pytest-mock==3.6.1
Expand Down
13 changes: 3 additions & 10 deletions tests/test_proxy_functional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,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.
Expand All @@ -53,18 +53,11 @@ def secure_proxy_url(monkeypatch, tls_certificate_pem_path):
if not IS_MACOS and not IS_WINDOWS:
proxypy_args.append("--threadless") # use asyncio

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=str(proxy_instance.flags.hostname),
port=proxy_instance.flags.port,
)


Expand Down