Skip to content

fix(ci): reconcile the cross-repo sparse-scope mirror and the sandboxed exit test #4480

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

Merged
dieterolson merged 1 commit into from
Aug 15, 2026
Merged

fix(ci): reconcile the cross-repo sparse-scope mirror and the sandboxed exit test #4480

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
4 changes: 0 additions & 4 deletions .github/workflows/cross-repo-python-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,7 @@ jobs:
test_command: xvfb-run --auto-servernum pytest tests/shared_contracts/ --timeout=60 --timeout-method=thread -v --tb=short
env_name: REQUIRE_REAL_TOOLS_REPO
sparse_checkout: |
src/chat
src/contracts.py
src/python/src/utils
src/shared
src/sidekick
tests/shared_contracts
tests/support

Expand Down
22 changes: 9 additions & 13 deletions tests/ops/test_cross_repo_python_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@
"tests/shared_contracts",
},
"D-sorganization/UpstreamDrift": {
"chat",
"contracts.py",
"python/src/utils",
"shared",
"sidekick",
"src/shared/python",
# UpstreamDrift moved its consumed packages under src/shared/python, so
# this is the narrow root that carries them. Deliberately NOT bare `src`
# -- see the assertions in the test below.
"src/shared",
"tests/shared_contracts",
"tests/support",
},
Expand Down Expand Up @@ -75,13 +73,11 @@ def test_upstream_scope_includes_every_release_build_package_root() -> None:
)

scope = set(upstream["sparse_checkout"].splitlines())
assert {
"chat",
"contracts.py",
"python/src/utils",
"shared",
"sidekick",
} <= scope
# `src/shared` is the package root that actually carries the code this repo
# provides to UpstreamDrift; `pip install -e .` there resolves through
# hatchling's `packages = ["src"]`, and cone-mode sparse checkout gives it a
# populated `src/shared` without pulling all of `src`.
assert {"src/shared"} <= scope


def test_downstream_checkout_keeps_sparse_checkout_authoritative() -> None:
Expand Down
5 changes: 4 additions & 1 deletion tests/rotation_converter/test_scripting_env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ def test_refresh_user_functions_system_exit_propagates(self) -> None:
self.env.set_user_library_path(user_lib_path)

# Save code that raises SystemExit
self.env.save_user_code("import sys; sys.exit(1)")
# `import sys` is blocked by the scripting sandbox, so importing it to
# reach sys.exit never raises. SystemExit is a builtin, so raise it
# directly to test what this case is actually about: propagation.
self.env.save_user_code("raise SystemExit(1)")

# Should propagate instead of being caught and logged
with self.assertRaises(SystemExit):
Expand Down
Loading