-
Notifications
You must be signed in to change notification settings - Fork 70
fix(environment): keep the package importable without unix sockets #621
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.
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
Open
mikhail-koviazin
wants to merge
2
commits into
hud-evals:main
Choose a base branch
from
mikhail-koviazin:fix/import-without-unix-sockets
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| """Regression test for importing the package where unix sockets do not exist. | ||
|
|
||
| Both routes out of a workspace are served on unix sockets and a session runs on a pty, | ||
| and each reached for its platform at module scope: a | ||
| ``socketserver.ThreadingUnixStreamServer`` subclass in :mod:`hud.environment.egress`, | ||
| and a top-level ``import pty`` in :mod:`hud.environment.namespace`. Neither exists on | ||
| Windows, so ``import hud`` raised there before any of it was used, taking down the | ||
| commands that never go near a workspace with it. Both now sit behind the platform | ||
| guard the rest of the package already applies. | ||
|
|
||
| The breakage is at import time, so the check runs in a fresh interpreter. That | ||
| interpreter imports the package once as the platform it really is, because the | ||
| standard library and the dependencies settle their own platform at their first import | ||
| and will not be told otherwise afterwards, and then imports it again with only the | ||
| package's own modules dropped, the platform reported as Windows, and the unix pieces | ||
| taken away. | ||
| """ | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| import subprocess | ||
| import sys | ||
|
|
||
| _IMPORT_AS_WINDOWS = """ | ||
| import socketserver | ||
| import sys | ||
|
|
||
| import hud | ||
|
|
||
| for name in [n for n in sys.modules if n == "hud" or n.startswith("hud.")]: | ||
| del sys.modules[name] | ||
|
|
||
| sys.platform = "win32" | ||
| sys.modules["pty"] = None # a Windows interpreter has no pty module to import | ||
| socketserver.__dict__.pop("ThreadingUnixStreamServer", None) # nor this server | ||
|
|
||
| import hud | ||
|
|
||
| print("IMPORTED") | ||
| """ | ||
|
|
||
|
|
||
| def test_the_package_imports_where_unix_sockets_do_not_exist() -> None: | ||
| result = subprocess.run( | ||
| [sys.executable, "-c", _IMPORT_AS_WINDOWS], | ||
| capture_output=True, | ||
| text=True, | ||
| timeout=120, | ||
| ) | ||
|
|
||
| assert result.returncode == 0, f"stdout={result.stdout!r}\nstderr={result.stderr!r}" | ||
| assert "IMPORTED" in result.stdout |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.