Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions scripts/check_deliberate_break.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@ def _json_result(verdict: str, **fields: object) -> dict[str, object]:
return {"verdict": verdict, **fields}


def _subprocess_output_text(value: str | bytes | None) -> str | None:
"""Normalize captured subprocess output for JSON result payloads."""
if isinstance(value, bytes):
return value.decode(errors="replace")
return value


def _write_github_output(**fields: str) -> None:
output_path = os.environ.get("GITHUB_OUTPUT")
if not output_path:
Expand Down Expand Up @@ -823,8 +830,8 @@ def verify_spec(
reason="archive-command-failed",
command=list(exc.cmd) if isinstance(exc.cmd, (tuple, list)) else str(exc.cmd),
returncode=exc.returncode,
stdout=exc.stdout,
stderr=exc.stderr,
stdout=_subprocess_output_text(exc.stdout),
stderr=_subprocess_output_text(exc.stderr),
)
except OSError as exc:
return _json_result(
Expand Down
11 changes: 9 additions & 2 deletions templates/consumer-repo/scripts/check_deliberate_break.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@ def _json_result(verdict: str, **fields: object) -> dict[str, object]:
return {"verdict": verdict, **fields}


def _subprocess_output_text(value: str | bytes | None) -> str | None:
"""Normalize captured subprocess output for JSON result payloads."""
if isinstance(value, bytes):
return value.decode(errors="replace")
return value


def _write_github_output(**fields: str) -> None:
output_path = os.environ.get("GITHUB_OUTPUT")
if not output_path:
Expand Down Expand Up @@ -823,8 +830,8 @@ def verify_spec(
reason="archive-command-failed",
command=list(exc.cmd) if isinstance(exc.cmd, (tuple, list)) else str(exc.cmd),
returncode=exc.returncode,
stdout=exc.stdout,
stderr=exc.stderr,
stdout=_subprocess_output_text(exc.stdout),
stderr=_subprocess_output_text(exc.stderr),
)
except OSError as exc:
return _json_result(
Expand Down
6 changes: 4 additions & 2 deletions tests/scripts/test_check_deliberate_break.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import json
import os
import subprocess
import sys
Expand Down Expand Up @@ -1286,8 +1287,8 @@ def test_base_archive_command_failure_is_not_dependency_failure(tmp_path, monkey
error = subprocess.CalledProcessError(
17,
["git", "archive", base],
output="archive output",
stderr="bad ref",
output=b"archive output",
stderr=b"bad ref",
)
monkeypatch.setattr(
deliberate_break,
Expand All @@ -1305,6 +1306,7 @@ def test_base_archive_command_failure_is_not_dependency_failure(tmp_path, monkey
"stdout": "archive output",
"stderr": "bad ref",
}
json.dumps(result)


def test_base_setup_failure_is_not_dependency_failure(tmp_path, monkeypatch) -> None:
Expand Down
Loading