lei.chen/myxce
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(controller-peers-env-fallback): keep existing no-peers test scripts on the path they test (task 5.2)

Browse source 
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Rongsong Shen 2026-10-03 08:13:31 +00:00
parent ac7a43855d
commit f70652981a
Signed by untrusted user: rshen
GPG key ID: 80533536B0EB651C
3 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/tools/test-dirty-fingerprint-startup-log-unchanged.sh
View file

@ -89,6 +89,10 @@
# composeVersionDisplay()'s strings.TrimSuffix() call.
set -euo pipefail
# The scheduler below starts without --peers; keep a caller's XCE_CONTROLLER_PEERS
# from moving it off the single-controller path this script tests.
unset XCE_CONTROLLER_PEERS
# ── paths ───────────────────────────────────────────────────────────────────
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
WORKTREE="$(cd "$SCRIPT_DIR/../.." && pwd)"
@ -471,6 +475,12 @@ if [ -z "$sched_log_line" ]; then
overall_pass=0
else
yellow "[scheduler] startup log line: [$sched_log_line]"
if grep -F -- "No --peers flag" "$sched_log" | grep -qF -- "XCE_CONTROLLER_PEERS unset or empty"; then
green "PASS [scheduler-no-peers]: scheduler took the single-controller path (no --peers, XCE_CONTROLLER_PEERS unset)."
else
red "FAIL [scheduler-no-peers]: scheduler log has no 'No --peers flag ... XCE_CONTROLLER_PEERS unset or empty' line -- it did not take the single-controller path this script tests."
overall_pass=0
fi
if [ -n "$sched_fp" ]; then
if ! assert_startup_log_unchanged "scheduler-startup-log" "$sched_log_line" "sched" "$base_commit" "$sched_fp"; then
overall_pass=0

10
src/tools/test-version-startup-consistency.sh
View file

@ -103,6 +103,10 @@
# "********** Initialize Logger done!" log message in the same file.
set -euo pipefail
# The scheduler below starts without --peers; keep a caller's XCE_CONTROLLER_PEERS
# from moving it off the single-controller path this script tests.
unset XCE_CONTROLLER_PEERS
# ── paths ───────────────────────────────────────────────────────────────────
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
WORKTREE="$(cd "$SCRIPT_DIR/../.." && pwd)"
@ -323,6 +327,12 @@ if [ -z "$sched_log_line" ]; then
sched_v_commit=""; sched_v_build=""
else
yellow "[scheduler] startup log line: [$sched_log_line]"
if grep -F -- "No --peers flag" "$sched_log" | grep -qF -- "XCE_CONTROLLER_PEERS unset or empty"; then
green "PASS [scheduler-no-peers]: scheduler took the single-controller path (no --peers, XCE_CONTROLLER_PEERS unset)."
else
red "FAIL [scheduler-no-peers]: scheduler log has no 'No --peers flag ... XCE_CONTROLLER_PEERS unset or empty' line -- it did not take the single-controller path this script tests."
overall_pass=0
fi
if ! sched_v_fields="$(extract_composed_fields "$sched_version_raw" "$SCHED_VERSION_PREFIX")"; then
red "FAIL [scheduler]: --version output did not contain the expected prefix '$SCHED_VERSION_PREFIX' -- raw: [$sched_version_raw]"