Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

ci: make macOS E2E log filenames artifact-safe (#3893)

injaneity2d8eb1260997
diff --git a/libs/cua-driver/scripts/tests/test_macos_lume_runner.py b/libs/cua-driver/scripts/tests/test_macos_lume_runner.py
index 1f980a552b..b6978a9cd0 100644
--- a/libs/cua-driver/scripts/tests/test_macos_lume_runner.py
+++ b/libs/cua-driver/scripts/tests/test_macos_lume_runner.py
@@ -1496,14 +1496,45 @@ def test_a_green_run_writes_an_empty_failure_record(tmp_path: Path) -> None:
assert record["report_failed"] is False
+def test_namespaced_lane_writes_a_complete_artifact_safe_log(tmp_path: Path) -> None:
+ selector = "snapshot_publication::harness_appkit_pending_snapshot_cannot_retarget_token"
+ completed = _run(
+ RUN_RUST_E2E,
+ 'ARTIFACT_DIR="$TEST_ARTIFACT_DIR"\nRUST_ROOT="$TEST_ARTIFACT_DIR"\n'
+ 'run_test "appkit-$TEST_SELECTOR" bash -c '
+ '\'printf "%s\\n" "$@"; printf "stderr\\n" >&2\' -- --exact "$TEST_SELECTOR"\n',
+ env={"TEST_ARTIFACT_DIR": str(tmp_path), "TEST_SELECTOR": selector},
+ )
+ assert completed.returncode == 0, completed.stderr
+ log = tmp_path / (
+ "appkit-snapshot_publication__harness_appkit_pending_snapshot_cannot_retarget_token.log"
+ )
+ assert list(tmp_path.iterdir()) == [log]
+ assert log.read_text() == f"--exact\n{selector}\nstderr\n"
+
+
[email protected]("character", list('":<>|*?\r\n/\\'))
+def test_lane_log_replaces_nonportable_characters(tmp_path: Path, character: str) -> None:
+ completed = _run(
+ RUN_RUST_E2E,
+ 'ARTIFACT_DIR="$TEST_ARTIFACT_DIR"\nRUST_ROOT="$TEST_ARTIFACT_DIR"\n'
+ 'run_test "$TEST_LABEL" printf "%s\\n" evidence\n',
+ env={"TEST_ARTIFACT_DIR": str(tmp_path), "TEST_LABEL": f"left{character}right"},
+ )
+ assert completed.returncode == 0, completed.stderr
+ log = tmp_path / "left_right.log"
+ assert list(tmp_path.iterdir()) == [log]
+ assert log.read_text() == "evidence\n"
+
+
def test_lane_bookkeeping_records_only_failing_lanes(tmp_path: Path) -> None:
artifact_dir = tmp_path / "artifacts"
artifact_dir.mkdir()
completed = _run(
RUN_RUST_E2E,
'ARTIFACT_DIR="$TEST_ARTIFACT_DIR"\nRUST_ROOT="$TEST_ARTIFACT_DIR"\n'
- "run_test green true\n"
- "run_test red false\n"
+ "run_test green-09.v1 true\n"
+ "run_test red::lane false\n"
'printf "count=%s\\n" "$FAILURE_COUNT"\n'
'printf "lanes=%s\\n" "${FAILED_LANES[*]}"\n',
env={"TEST_ARTIFACT_DIR": str(artifact_dir)},
@@ -1511,6 +1542,6 @@ def test_lane_bookkeeping_records_only_failing_lanes(tmp_path: Path) -> None:
assert completed.returncode == 0, completed.stderr
fields = _fields(completed.stdout)
assert fields["count"] == "1"
- assert fields["lanes"] == "red"
- assert (artifact_dir / "green.log").exists()
- assert (artifact_dir / "red.log").exists()
+ assert fields["lanes"] == "red::lane"
+ assert (artifact_dir / "green-09.v1.log").exists()
+ assert (artifact_dir / "red__lane.log").exists()
diff --git a/scripts/ci/macos/run-rust-e2e.sh b/scripts/ci/macos/run-rust-e2e.sh
index ce540a36ff..54a0276a7c 100755
--- a/scripts/ci/macos/run-rust-e2e.sh
+++ b/scripts/ci/macos/run-rust-e2e.sh
@@ -123,9 +123,10 @@ write_failure_record() {
run_test() {
local name="$1"; shift
+ local log_name="${name//[^a-zA-Z0-9._-]/_}"
echo "[RUN] ${name}"
set +e
- (cd "${RUST_ROOT}" && "$@") 2>&1 | tee "${ARTIFACT_DIR}/${name}.log"
+ (cd "${RUST_ROOT}" && "$@") 2>&1 | tee "${ARTIFACT_DIR}/${log_name}.log"
local exit_code=${PIPESTATUS[0]}
set -e
if [[ "${exit_code}" != 0 ]]; then