Skip to content

fix(tests): make vuln-scanner status test tolerant of the timeout-aware block #1057

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
aaronjmars merged 1 commit into from
Sep 11, 2026
Merged

fix(tests): make vuln-scanner status test tolerant of the timeout-aware block #1057

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
10 changes: 9 additions & 1 deletion scripts/tests/test_vuln_scanner_status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,15 @@ def test_history_status_uses_exit_code_not_finding_count(self):
self.assertEqual(rows[-1], f"trufflehog-git={expected}")

def test_filesystem_clean_empty_stream_is_ok(self):
row = next(line for line in SKILL.splitlines() if line.startswith('echo "trufflehog='))
# The filesystem trufflehog status is the RC-driven ok/fail echo. It now lives
# inside a timeout-aware if/else (the `=124` guard mirrors the git block), so it
# is indented and sits alongside a sibling `trufflehog=timeout` line - select it
# by its ok/fail expression and strip the indentation before running it.
row = next(
line.strip()
for line in SKILL.splitlines()
if line.strip().startswith('echo "trufflehog=') and "&& echo ok" in line
)
with tempfile.TemporaryDirectory() as directory:
for rc, expected in [(0, "ok"), (1, "fail")]:
subprocess.run(["bash", "-c", f"TRUFFLEHOG_RC={rc}\n" + row.replace("/tmp/vuln-scan", directory)], check=True)
Expand Down
Loading