Skip to content

test(runs): isolate runner tests from ACTL env #252

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
xraymemory merged 4 commits into from
Jun 2, 2026
Merged

test(runs): isolate runner tests from ACTL env #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a2f6a2
test(runs): isolate runner tests from ACTL env
xraymemory Jun 2, 2026
6989aa0
test(runs): isolate workspace script detection
xraymemory Jun 2, 2026
25b3b65
test(runs): avoid pixi prep in pre-job test
xraymemory Jun 2, 2026
9583cc5
Merge branch 'main' into fix/runs-test-actl-env
xraymemory Jun 2, 2026
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
18 changes: 16 additions & 2 deletions tests/runs/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,29 @@
from __future__ import annotations

import os
from pathlib import Path

import pytest
from sampleworks.runs import runner


@pytest.fixture(autouse=True)
def force_pixi_argv(monkeypatch: pytest.MonkeyPatch) -> None:
"""Keep argv assertions deterministic on machines with /app/.pixi present."""
def force_pixi_argv(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
"""Keep argv assertions deterministic across dev and ACTL image environments."""
monkeypatch.delenv("SAMPLEWORKS_GRID_SEARCH_SCRIPT", raising=False)
monkeypatch.delenv("SAMPLEWORKS_PIXI_PROJECT_DIR", raising=False)
monkeypatch.setattr(
runner,
"WORKSPACE_GRID_SEARCH_SCRIPT",
str(tmp_path / "missing-workspace" / "run_grid_search.py"),
)
for var in (
"RUNTIME_PIXI",
"SAMPLEWORKS_ALLOW_RUNTIME_PIXI",
"SAMPLEWORKS_REQUIRE_PREBUILT_PIXI",
"SAMPLEWORKS_SKIP_ENV_PREPARE",
):
monkeypatch.delenv(var, raising=False)
for var in list(os.environ):
if var.startswith("SAMPLEWORKS_") and var.endswith("_PYTHON"):
monkeypatch.delenv(var, raising=False)
Expand Down
1 change: 1 addition & 0 deletions tests/runs/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ def test_pre_jobs_run_before_main_jobs(tmp_path: Path, monkeypatch: pytest.Monke
"""Sequential pre-jobs complete before regular jobs are launched."""
monkeypatch.setenv("HOME", str(tmp_path))
monkeypatch.setenv("SAMPLEWORKS_PIXI_PROJECT_DIR", str(tmp_path))
monkeypatch.delenv("SAMPLEWORKS_FORCE_PIXI", raising=False)
monkeypatch.setenv("SAMPLEWORKS_ANALYSIS_PYTHON", sys.executable)
pre_script = tmp_path / "pre.py"
main_script = tmp_path / "main.py"
Expand Down
Loading