Skip to content

fix(tests): force the non-TTY condition instead of inheriting it #177

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
MCamner merged 2 commits into from
Aug 8, 2026
Merged

fix(tests): force the non-TTY condition instead of inheriting it #177

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6895b58
fix(tests): force the non-TTY condition instead of inheriting it
MCamner Aug 6, 2026
43fc7ca
fix(tests): use mktemp for gitmerge-safe smoke output file
MCamner Aug 8, 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
11 changes: 9 additions & 2 deletions tests/gitmerge-safe-smoke.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,15 @@ tmpdir="$(mktemp -d)"
printf 'base\n' > file.txt
git add file.txt
git commit -qm base
"$MERGE_SCRIPT" >/tmp/gitmerge-safe-smoke.out 2>&1 && exit 1
grep -q 'interactive terminal' /tmp/gitmerge-safe-smoke.out
# stdin must be redirected explicitly, not inherited. The gate is [[ -t 0 ]],
# so this step only proved anything when the suite happened to run without a
# TTY. Run from mqlaunch's SELF-CHECK in a real terminal the gate correctly
# passed, the script walked on to "No candidate branches found to merge", and
# the assertion below failed against a script that was behaving properly.
out="$(mktemp)"
"$MERGE_SCRIPT" </dev/null >"$out" 2>&1 && exit 1
grep -q 'interactive terminal' "$out"
rm -f "$out"
)

echo "[10/10] TTY gate precedes network fetch"
Expand Down
Loading