Skip to content

ci: make timeout-clock regression test scheduler-independent #584

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
codeforester merged 1 commit into from
Nov 2, 2026
Merged

ci: make timeout-clock regression test scheduler-independent #584

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
20 changes: 9 additions & 11 deletions lib/bash/std/tests/lib_std.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3212,7 +3212,7 @@ EOF

@test "base_std_run reports external timeout-clock failures as infrastructure without retrying" {
local fake_bin="$TEST_TMPDIR/broken-timeout-clock"
local counter_file="$TEST_TMPDIR/broken-timeout-counter"
local clock_count_file="$TEST_TMPDIR/broken-timeout-clock-count"
local stderr_file="$TEST_TMPDIR/broken-timeout.err"
local rc

Expand All @@ -3223,28 +3223,26 @@ if [[ "${1-}" == --version ]]; then
printf 'timeout (GNU coreutils) 9.5\n'
exit 0
fi
exit 7
EOF
create_script "$TEST_TMPDIR/should-not-run.sh" <<'EOF'
#!/usr/bin/env bash
count=0
[[ -f "$1" ]] && count="$(cat "$1")"
printf '%s\n' "$((count + 1))" > "$1"
/bin/sleep 3
[[ -f "$BASE_TEST_TIMEOUT_CLOCK_COUNT" ]] && count="$(< "$BASE_TEST_TIMEOUT_CLOCK_COUNT")"
printf '%s\n' "$((count + 1))" > "$BASE_TEST_TIMEOUT_CLOCK_COUNT"
exit 7
EOF
ln -s "$(command -v mktemp)" "$fake_bin/mktemp"
ln -s "$(command -v rm)" "$fake_bin/rm"

if PATH="$fake_bin" base_std_run --no-exit --max-attempts 3 --timeout 1 \
/bin/bash "$TEST_TMPDIR/should-not-run.sh" "$counter_file" \
# A broken clock can stop the child before its first instruction. Count
# clock executions to prove no retry without depending on child scheduling.
if BASE_TEST_TIMEOUT_CLOCK_COUNT="$clock_count_file" PATH="$fake_bin" \
base_std_run --no-exit --max-attempts 3 --timeout 1 /bin/sleep 3 \
2>"$stderr_file"; then
rc=0
else
rc=$?
fi

[ "$rc" -eq 125 ]
[ "$(cat "$counter_file")" = "1" ]
[ "$(< "$clock_count_file")" = "1" ]
[[ "$(cat "$stderr_file")" == *"could not be supervised safely"* ]]
[[ "$(cat "$stderr_file")" != *"attempt 1 of 3; retrying"* ]]
}
Expand Down
Loading