An agentic skills framework & software development methodology that works.
Fix companion test cleanup and argv assertions
Drew Ritter69ed41af9e8f
diff --git a/tests/brainstorm-server/auth.test.js b/tests/brainstorm-server/auth.test.jsindex f6158c90c..fc5bb79ec 100644--- a/tests/brainstorm-server/auth.test.js+++ b/tests/brainstorm-server/auth.test.js@@ -298,7 +298,10 @@ async function runTests() {});console.log(`\n--- Results: ${passed} passed, ${failed} failed ---`);- if (failed > 0) process.exit(1);+ if (failed > 0) {+ process.exitCode = 1;+ return;+ }} finally {server.kill();await sleep(100);diff --git a/tests/brainstorm-server/start-server.test.sh b/tests/brainstorm-server/start-server.test.shindex 100e9b245..a4802dab6 100644--- a/tests/brainstorm-server/start-server.test.sh+++ b/tests/brainstorm-server/start-server.test.sh@@ -48,7 +48,7 @@ make_fake_uname "$TEST_DIR/fake-bin"cat > "$TEST_DIR/fake-bin/node" <<'EOF'#!/usr/bin/env bashecho "CAPTURED_OWNER_PID=${BRAINSTORM_OWNER_PID:-__UNSET__}"-echo "CAPTURED_ARGV=$*"+printf 'CAPTURED_ARGV=%s\n' "$@"exit 0EOFchmod +x "$TEST_DIR/fake-bin/node"@@ -67,12 +67,11 @@ else"expected empty or unset, got '$owner_pid_value'"fi-captured_argv=$(echo "$captured" | grep "CAPTURED_ARGV=" | head -1 | sed 's/CAPTURED_ARGV=//')-if echo "$captured_argv" | grep -Eq -- '--brainstorm-server-id=[A-Za-z0-9_-]{32,64}'; then+if echo "$captured" | grep -Eq '^CAPTURED_ARGV=--brainstorm-server-id=[A-Za-z0-9_-]{32,64}$'; thenpass "passes shell-safe server instance id argv"elsefail "passes shell-safe server instance id argv" \- "expected --brainstorm-server-id=<safe id>, got: $captured_argv"+ "expected exact --brainstorm-server-id=<safe id> argv line, got: $captured"fiserver_id_file=$(find "$TEST_DIR/project/.superpowers/brainstorm" -name server-instance-id -print 2>/dev/null | head -1)diff --git a/tests/brainstorm-server/windows-lifecycle.test.sh b/tests/brainstorm-server/windows-lifecycle.test.shindex 69f1d6f27..2a18495ae 100755--- a/tests/brainstorm-server/windows-lifecycle.test.sh+++ b/tests/brainstorm-server/windows-lifecycle.test.sh@@ -162,7 +162,7 @@ if [[ "$is_windows" == "true" ]]; thencat > "$FAKE_NODE_DIR/node" <<'FAKENODE'#!/usr/bin/env bashecho "CAPTURED_OWNER_PID=${BRAINSTORM_OWNER_PID:-__UNSET__}"-echo "CAPTURED_ARGV=$*"+printf 'CAPTURED_ARGV=%s\n' "$@"exit 0FAKENODEchmod +x "$FAKE_NODE_DIR/node"@@ -177,8 +177,7 @@ FAKENODE"Expected empty or unset, got '$owner_pid_value'"fi- captured_argv=$(echo "$captured" | grep "CAPTURED_ARGV=" | head -1 | sed 's/CAPTURED_ARGV=//')- if echo "$captured_argv" | grep -Eq -- '--brainstorm-server-id=[A-Za-z0-9_-]{32,64}'; then+ if echo "$captured" | grep -Eq '^CAPTURED_ARGV=--brainstorm-server-id=[A-Za-z0-9_-]{32,64}$'; thenpass "start-server.sh passes server instance id argv on Windows"elsefail "start-server.sh passes server instance id argv on Windows" \@@ -360,6 +359,7 @@ echo "$STOP_TEST_PID" > "$TEST_DIR/stop-test/state/server.pid"if ! wait_for_server_info "$TEST_DIR/stop-test"; thenfail "Stop-test server starts" "Server did not start"kill "$STOP_TEST_PID" 2>/dev/null || true+ wait "$STOP_TEST_PID" 2>/dev/null || trueSTOP_TEST_PID=""elsebash "$STOP_SCRIPT" "$TEST_DIR/stop-test" >/dev/null 2>&1 || true