kami/test-e2e
1
0
Fork 0
Code Issues 20 Pull Requests 7 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/orchestra/06G4GBSQ2WRGD5HGYPYZZ4TYH0' into integrate

Browse Source 
# Conflicts:
#	TASK.md
#	scripts/orchestra_e2e_healthcheck.sh
This commit is contained in:
kami
2026-08-29 18:05:39 +04:00
parent 51490707f5 ec0502f829
commit 835d796781
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/orchestra_e2e_healthcheck.sh
+13 -1
View File
@@ -27,15 +27,18 @@ main() {
local summary= local summary=
local -a results=() local -a results=()
local timing= local timing=
local strict=
local unknown=
for arg in "$@"; do for arg in "$@"; do
if [ "$arg" = --help ]; then if [ "$arg" = --help ]; then
emit text 'Usage: %s [--quiet] [--json] [--summary] [--timing] [--list-checks]\n\n' "${0##*/}" emit text 'Usage: %s [--quiet] [--json] [--summary] [--timing] [--strict] [--list-checks]\n\n' "${0##*/}"
emit text 'Healthcheck script for Orchestra E2E tests.\n' emit text 'Healthcheck script for Orchestra E2E tests.\n'
emit text 'Exits 0 with a success message if all checks pass.\n' emit text 'Exits 0 with a success message if all checks pass.\n'
emit text ' --quiet Suppress the success message; still exits 0.\n' emit text ' --quiet Suppress the success message; still exits 0.\n'
emit text ' --list-checks Print the name of each check; exits 0.\n' emit text ' --list-checks Print the name of each check; exits 0.\n'
emit text ' --summary Print one line per check before the success message.\n' emit text ' --summary Print one line per check before the success message.\n'
emit text ' --timing Print elapsed milliseconds for each check.\n' emit text ' --timing Print elapsed milliseconds for each check.\n'
emit text ' --strict Reject an unrecognised flag: exits 2.\n'
emit text 'Version: %s\n' "$VERSION" emit text 'Version: %s\n' "$VERSION"
exit 0 exit 0
elif [ "$arg" = --list-checks ]; then elif [ "$arg" = --list-checks ]; then
@@ -51,9 +54,18 @@ main() {
summary=1 summary=1
elif [ "$arg" = --timing ]; then elif [ "$arg" = --timing ]; then
timing=1 timing=1
elif [ "$arg" = --strict ]; then
strict=1
else
[ -n "$unknown" ] || unknown=$arg
fi fi
done done
if [ -n "$strict" ] && [ -n "$unknown" ]; then
printf 'unknown flag: %s\n' "$unknown" >&2
exit 2
fi
results+=("healthcheck ok") results+=("healthcheck ok")
local format=text local format=text
scripts/orchestra_e2e_selftest.sh
+12
View File
@@ -34,4 +34,16 @@ case "$jout" in
*) fail '--json run stdout prefix: want {"status":' "$jout" ;; *) fail '--json run stdout prefix: want {"status":' "$jout" ;;
esac esac
# --strict rejects an unknown flag
sout=$(bash "$healthcheck" --strict --nonsense 2>&1)
sstatus=$?
[ "$sstatus" -eq 2 ] || fail "--strict --nonsense exit status: want 2, got $sstatus" "$sout"
# --strict alone is accepted
gout=$(bash "$healthcheck" --strict)
gstatus=$?
[ "$gstatus" -eq 0 ] || fail "--strict run exit status: want 0, got $gstatus" "$gout"
printf 'selftest: ok\n' printf 'selftest: ok\n'
scripts/test_healthcheck.sh
+1 -1
View File
@@ -3,7 +3,7 @@
HC="$(dirname "$0")/orchestra_e2e_healthcheck.sh" HC="$(dirname "$0")/orchestra_e2e_healthcheck.sh"
OK='OK - all healthchecks passed' OK='OK - all healthchecks passed'
USAGE="$(printf 'Usage: orchestra_e2e_healthcheck.sh [--quiet] [--json] [--summary] [--timing] [--list-checks]\n\nHealthcheck script for Orchestra E2E tests.\nExits 0 with a success message if all checks pass.\n --quiet Suppress the success message; still exits 0.\n --list-checks Print the name of each check; exits 0.\n --summary Print one line per check before the success message.\n --timing Print elapsed milliseconds for each check.\nVersion: 1.0.0')" USAGE="$(printf 'Usage: orchestra_e2e_healthcheck.sh [--quiet] [--json] [--summary] [--timing] [--strict] [--list-checks]\n\nHealthcheck script for Orchestra E2E tests.\nExits 0 with a success message if all checks pass.\n --quiet Suppress the success message; still exits 0.\n --list-checks Print the name of each check; exits 0.\n --summary Print one line per check before the success message.\n --timing Print elapsed milliseconds for each check.\n --strict Reject an unrecognised flag: exits 2.\nVersion: 1.0.0')"
fails=0 fails=0
check() { # check <expected-stdout> <label> [args...] check() { # check <expected-stdout> <label> [args...]