Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5bcffb337f | |||
| affbbe411b | |||
| ec320c8240 | |||
| ba0e891348 | |||
| 56d9b9acdd | |||
| 14654d6cab | |||
| f48e363d99 | |||
| 0d1585df93 | |||
| 41dee80241 | |||
| 3a076dca70 |
@@ -0,0 +1,25 @@
|
|||||||
|
# Task 06G4GWWJ8SWFREF06HDYEBAG0C
|
||||||
|
|
||||||
|
Route the healthcheck output through one helper
|
||||||
|
|
||||||
|
- Project: test-e2e
|
||||||
|
- Source: gitea:test-e2e/15
|
||||||
|
- Priority: 0
|
||||||
|
|
||||||
|
## Instructions
|
||||||
|
|
||||||
|
`scripts/orchestra_e2e_healthcheck.sh` prints its success line from more than one place. Centralise the output so every path goes through one helper, and give that helper an explicit format argument rather than reading a global.
|
||||||
|
|
||||||
|
Behaviour must not change. The plain run, `--quiet`, `--help` and `--json` all keep their current output and exit statuses, and `scripts/test_healthcheck.sh` keeps passing.
|
||||||
|
|
||||||
|
## Research first
|
||||||
|
|
||||||
|
Establish at least three findings with distinct confidence: at least one `fact`, one `inference`, one `assumption`.
|
||||||
|
|
||||||
|
|
||||||
|
## Completion
|
||||||
|
|
||||||
|
Run the configured quality gate. When the task is ready for the worker to verify and deliver, create `.orchestra/done`. Do not write a prose completion report.
|
||||||
|
|
||||||
|
This file is immutable for the lifetime of the task (§6.2) — its hash is
|
||||||
|
carried in every handoff and re-verified on every pickup. Do not edit it.
|
||||||
@@ -1,16 +1,41 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# emit <format> <template> [args...]: the single output path.
|
||||||
|
# format: text or json print; none suppresses (--quiet). Explicit argument,
|
||||||
|
# never read from an enclosing variable.
|
||||||
|
emit() {
|
||||||
|
local format=$1
|
||||||
|
shift
|
||||||
|
[ "$format" = none ] || printf "$@"
|
||||||
|
}
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
|
local quiet=
|
||||||
|
local json=
|
||||||
for arg in "$@"; do
|
for arg in "$@"; do
|
||||||
if [ "$arg" = --help ]; then
|
if [ "$arg" = --help ]; then
|
||||||
printf 'Usage: %s\n\n' "${0##*/}"
|
emit text 'Usage: %s [--quiet]\n\n' "${0##*/}"
|
||||||
printf 'Healthcheck script for Orchestra E2E tests.\n'
|
emit text 'Healthcheck script for Orchestra E2E tests.\n'
|
||||||
printf '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'
|
||||||
exit 0
|
exit 0
|
||||||
|
elif [ "$arg" = --quiet ]; then
|
||||||
|
quiet=1
|
||||||
|
elif [ "$arg" = --json ]; then
|
||||||
|
json=1
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
printf 'OK - all healthchecks passed\n'
|
local format=text
|
||||||
|
[ -n "$quiet" ] && format=none
|
||||||
|
[ -n "$json" ] && format=json
|
||||||
|
|
||||||
|
if [ "$format" = json ]; then
|
||||||
|
emit "$format" '{"status":"ok","checks":1}\n'
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
emit "$format" 'OK - all healthchecks passed\n'
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Executable
+37
@@ -0,0 +1,37 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Self-test for the Orchestra E2E healthcheck.
|
||||||
|
|
||||||
|
here=$(cd "$(dirname "$0")" && pwd)
|
||||||
|
healthcheck="$here/orchestra_e2e_healthcheck.sh"
|
||||||
|
|
||||||
|
# fail <assertion> <captured stdout>: always echo what the healthcheck printed,
|
||||||
|
# so a red run is diagnosable without rerunning it by hand.
|
||||||
|
fail() {
|
||||||
|
printf 'selftest: FAILED %s\n' "$1" >&2
|
||||||
|
printf 'selftest: healthcheck stdout was:\n%s\n' "$2" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# plain run
|
||||||
|
out=$(bash "$healthcheck")
|
||||||
|
status=$?
|
||||||
|
|
||||||
|
[ "$status" -eq 0 ] || fail "plain run exit status: want 0, got $status" "$out"
|
||||||
|
case "$out" in
|
||||||
|
*OK*) ;;
|
||||||
|
*) fail "plain run stdout contains OK" "$out" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# --json run
|
||||||
|
jout=$(bash "$healthcheck" --json)
|
||||||
|
jstatus=$?
|
||||||
|
|
||||||
|
[ "$jstatus" -eq 0 ] || fail "--json run exit status: want 0, got $jstatus" "$jout"
|
||||||
|
jlines=$(printf '%s\n' "$jout" | wc -l)
|
||||||
|
[ "$jlines" -eq 1 ] || fail "--json run line count: want 1, got $jlines" "$jout"
|
||||||
|
case "$jout" in
|
||||||
|
'{"status":'*) ;;
|
||||||
|
*) fail '--json run stdout prefix: want {"status":' "$jout" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
printf 'selftest: ok\n'
|
||||||
Executable
+28
@@ -0,0 +1,28 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Self-check for orchestra_e2e_healthcheck.sh.
|
||||||
|
|
||||||
|
HC="$(dirname "$0")/orchestra_e2e_healthcheck.sh"
|
||||||
|
OK='OK - all healthchecks passed'
|
||||||
|
USAGE="$(printf 'Usage: orchestra_e2e_healthcheck.sh [--quiet]\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.')"
|
||||||
|
fails=0
|
||||||
|
|
||||||
|
check() { # check <expected-stdout> <label> [args...]
|
||||||
|
local want=$1 label=$2 got status
|
||||||
|
shift 2
|
||||||
|
got=$(bash "$HC" "$@" 2>/dev/null)
|
||||||
|
status=$?
|
||||||
|
if [ "$got" != "$want" ] || [ "$status" -ne 0 ]; then
|
||||||
|
printf 'FAIL: %s (exit=%s)\n---got---\n%s\n---want---\n%s\n' "$label" "$status" "$got" "$want"
|
||||||
|
fails=$((fails + 1))
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
check "$OK" 'no args'
|
||||||
|
check '' '--quiet' --quiet
|
||||||
|
check "$USAGE" '--help' --help
|
||||||
|
check "$USAGE" '--help --quiet' --help --quiet
|
||||||
|
check "$USAGE" '--quiet --help' --quiet --help
|
||||||
|
check "$OK" 'unknown flag ignored' --bogus
|
||||||
|
|
||||||
|
[ "$fails" -eq 0 ] || exit 1
|
||||||
|
printf 'all checks passed\n'
|
||||||
Reference in New Issue
Block a user