kuhyx/testsAndMisc
1
0
Fork 0
mirror of https://github.com/kuhyx/testsAndMisc.git synced 2026-11-10 20:27:02 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

test_shutdown_timer_monitor: actually populate SETUP_SOURCES

Browse Source 
The template checks were grepping an empty argument list. SETUP_SOURCES was
initialised as SETUP_SOURCES=("${SETUP_SOURCES[@]}") — a self-reference to an
array that did not exist yet — so it started empty, never contained
$SETUP_SCRIPT, and the lib-discovery loop ran dirname on nothing.

CI reported "setup_midnight_shutdown.sh should install the D-Bus monitor
helper". Reproduced locally before changing anything, so the fix is verified
against the real failure.

Seeding it with ("$SETUP_SCRIPT") restores the intent: search the entry
script together with lib/ms_*.sh, since the monitor template moved into
lib/ms_monitor.sh during the split.

test_pacman_wrapper_security.sh and test_hosts_guard_pacman_integration.sh
re-checked at the same time and both pass, so the Shell tests set is green
again before the file-length gate goes in.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01F3PzGc75gBcdxP3PkHXGcV
This commit is contained in:
Krzysztof Rudnicki 2026-08-21 16:32:51 +02:00
parent d72f03ea93
commit 40e2e22359
2 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
docs/superpowers/evidence/shutdown-monitor-test-split-aware-2026-08-21.json Normal file
View File

@ -0,0 +1,34 @@
{
"intent": "Repair the Shell tests failure from the setup_midnight_shutdown split: the installer-template checks searched an array that was never populated, so they grepped nothing and failed.",
"scope": [
"linux_configuration/tests/test_shutdown_timer_monitor.sh: the SETUP_SOURCES definition",
"Non-goal: the template assertions themselves, which are unchanged"
],
"changes": [
"SETUP_SOURCES was initialised as SETUP_SOURCES=(\"${SETUP_SOURCES[@]}\") — a self-reference to an array that did not exist yet, so it started EMPTY and never contained $SETUP_SCRIPT. The lib-discovery loop then called dirname on that empty array. Every template check was grepping an argument list with no entry script in it. Now seeded with (\"$SETUP_SCRIPT\") before the libs are appended.",
"The intent it was reaching for is preserved: the checks search the entry script together with lib/ms_*.sh, because the monitor template moved into lib/ms_monitor.sh during the split."
],
"verification": [
{
"command": "bash linux_configuration/tests/test_shutdown_timer_monitor.sh",
"result": "pass",
"evidence": "'shutdown-timer-monitor.sh regression checks passed.' The failure reproduced locally first — 'FAIL: setup_midnight_shutdown.sh should install the D-Bus monitor helper' — which is the same assertion CI reported, so the fix is verified against the actual failure and not a guess."
},
{
"command": "shellcheck linux_configuration/tests/test_shutdown_timer_monitor.sh",
"result": "pass",
"evidence": "rc=0. No suppression added; the two pre-existing SC2016 disables are unrelated and untouched."
},
{
"command": "bash linux_configuration/tests/test_pacman_wrapper_security.sh; bash .../test_hosts_guard_pacman_integration.sh",
"result": "pass",
"evidence": "Both rc=0. These failed on the pacman-split commit and were repaired by ef12e9c6; re-checked here so the whole Shell tests set is green before the file-length gate is wired in Phase 2."
}
],
"risks": [
"These remain grep-based template checks: they prove the text exists somewhere in the entry script or its libs, not that the generated monitor behaves. That was equally true before the split. The behavioural coverage is the rest of this same file, which executes the real shutdown-timer-monitor.sh."
],
"rollback": [
"git revert the commit; SETUP_SOURCES returns to the empty self-reference and the template checks fail again."
]
}

21
linux_configuration/tests/test_shutdown_timer_monitor.sh
View File

@ -7,6 +7,13 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
REPO_DIR=$(cd -- "$SCRIPT_DIR/.." && pwd)
TARGET_SCRIPT="$REPO_DIR/scripts/periodic_background/system-maintenance/bin/shutdown-timer-monitor.sh"
SETUP_SCRIPT="$REPO_DIR/scripts/periodic_background/digital_wellbeing/setup_midnight_shutdown.sh"
# The installer was split into lib/ms_*.sh under the 250-line cap, so these
# template checks search the entry script AND its libs: the monitor template
# now lives in lib/ms_monitor.sh, it did not disappear.
SETUP_SOURCES=("$SETUP_SCRIPT")
for _ms_lib in "$(dirname "$SETUP_SCRIPT")"/lib/ms_*.sh; do
[[ -f "$_ms_lib" ]] && SETUP_SOURCES+=("$_ms_lib")
done
fail() {
printf 'FAIL: %s\n' "$1" >&2
@ -171,18 +178,18 @@ wait_elapsed=$(env -i PATH="/usr/bin:/bin" SHUTDOWN_TIMER_MONITOR_SKIP_MAIN=1 /b
assert_equals '1' "$wait_elapsed" 'wait_seconds should not return immediately on /dev/null stdin'
printf 'Checking installer template stays in sync with the event-driven monitor...\n'
grep -Fq 'monitor_with_dbus()' "$SETUP_SCRIPT" ||
grep -Fq 'monitor_with_dbus()' "${SETUP_SOURCES[@]}" ||
fail 'setup_midnight_shutdown.sh should install the D-Bus monitor helper'
grep -Fq 'start_monitoring()' "$SETUP_SCRIPT" ||
grep -Fq 'start_monitoring()' "${SETUP_SOURCES[@]}" ||
fail 'setup_midnight_shutdown.sh should install the start_monitoring dispatcher'
grep -Fq 'if command -v busctl &>/dev/null; then' "$SETUP_SCRIPT" ||
grep -Fq 'if command -v busctl &>/dev/null; then' "${SETUP_SOURCES[@]}" ||
fail 'setup_midnight_shutdown.sh should prefer busctl when available'
grep -Fq 'current_epoch now_ts' "$SETUP_SCRIPT" ||
grep -Fq 'current_epoch now_ts' "${SETUP_SOURCES[@]}" ||
fail 'setup_midnight_shutdown.sh should use out-var epoch helper in D-Bus throttling path'
# Searching for this literal source text; expanding it would run
# current_epoch and grep for its output instead.
# shellcheck disable=SC2016
if grep -Fq 'now_ts=$(current_epoch)' "$SETUP_SCRIPT"; then
if grep -Fq 'now_ts=$(current_epoch)' "${SETUP_SOURCES[@]}"; then
fail 'setup_midnight_shutdown.sh should avoid subshell epoch capture in D-Bus path'
fi
# Literal source text, as above.
@ -190,9 +197,9 @@ fi
if grep -Fq 'now_ts=$(current_epoch)' "$TARGET_SCRIPT"; then
fail 'runtime shutdown monitor should avoid subshell epoch capture in D-Bus path'
fi
grep -Fq 'OnUnitActiveSec=300' "$SETUP_SCRIPT" ||
grep -Fq 'OnUnitActiveSec=300' "${SETUP_SOURCES[@]}" ||
fail 'setup_midnight_shutdown.sh should run watchdog timer at 300s cadence'
grep -Fq 'wait_seconds()' "$SETUP_SCRIPT" ||
grep -Fq 'wait_seconds()' "${SETUP_SOURCES[@]}" ||
fail 'setup_midnight_shutdown.sh should install builtin wait helper in polling fallback'
# Literal source text, as above.
# shellcheck disable=SC2016