Skip to content

🧹 [code health improvement] Extract execution logic in sandboxed_verify.py main function #858

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

Closed
seonghobae wants to merge 1 commit into from
Closed

🧹 [code health improvement] Extract execution logic in sandboxed_verify.py main function #858

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
49 changes: 27 additions & 22 deletions scripts/ci/sandboxed_verify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,32 @@ def emit_result(
print(f"{RESULT_MARKER} {json.dumps(payload, sort_keys=True)}")


def _execute_and_print_output(args: argparse.Namespace, copied_repo: Path, env: dict[str, str]) -> int:
"""Execute the command and print stdout/stderr, returning the exit code."""
print(f"sandboxed-verify: cwd={copied_repo}")
print(f"sandboxed-verify: command={' '.join(args.command)}")
if args.allow_env:
print(f"sandboxed-verify: allowed env names={','.join(sorted(set(args.allow_env)))}")
if args.network != "default":
print(f"sandboxed-verify: network={args.network}")
try:
completed = run_command(args.command, copied_repo, env, args.timeout)
if completed.stdout:
print(completed.stdout, end="")
if completed.stderr:
print(completed.stderr, end="", file=sys.stderr)
return completed.returncode
except subprocess.TimeoutExpired as exc:
stdout = timeout_output_text(exc.stdout)
stderr = timeout_output_text(exc.stderr)
if stdout:
print(stdout, end="" if stdout.endswith("\n") else "\n")
if stderr:
print(stderr, end="" if stderr.endswith("\n") else "\n", file=sys.stderr)
print(f"sandboxed-verify: command timed out after {args.timeout}s", file=sys.stderr)
return 124


def main(argv: Sequence[str] | None = None) -> int:
"""Run the CLI and return the verification command exit code."""
args = parse_args(argv)
Expand All @@ -210,28 +236,7 @@ def main(argv: Sequence[str] | None = None) -> int:
try:
copied_repo = copy_workspace(Path(args.repo_root), sandbox, args.ignore)
env = scrubbed_env(sandbox, args.allow_env)
print(f"sandboxed-verify: cwd={copied_repo}")
print(f"sandboxed-verify: command={' '.join(args.command)}")
if args.allow_env:
print(f"sandboxed-verify: allowed env names={','.join(sorted(set(args.allow_env)))}")
if args.network != "default":
print(f"sandboxed-verify: network={args.network}")
try:
completed = run_command(args.command, copied_repo, env, args.timeout)
if completed.stdout:
print(completed.stdout, end="")
if completed.stderr:
print(completed.stderr, end="", file=sys.stderr)
exit_code = completed.returncode
except subprocess.TimeoutExpired as exc:
stdout = timeout_output_text(exc.stdout)
stderr = timeout_output_text(exc.stderr)
if stdout:
print(stdout, end="" if stdout.endswith("\n") else "\n")
if stderr:
print(stderr, end="" if stderr.endswith("\n") else "\n", file=sys.stderr)
print(f"sandboxed-verify: command timed out after {args.timeout}s", file=sys.stderr)
exit_code = 124
exit_code = _execute_and_print_output(args, copied_repo, env)
return exit_code
finally:
elapsed = time.monotonic() - start
Expand Down
Loading