fix(e2e): harden web search cleanup

vincentkoc · vincentkoc · commit 65a805ac2878 · 2026-06-01T20:35:33.000+02:00
diff --git a/scripts/e2e/lib/openai-web-search-minimal/scenario.sh b/scripts/e2e/lib/openai-web-search-minimal/scenario.sh
@@ -22,14 +22,8 @@ mock_pid=""
 gateway_pid=""
 
 cleanup() {
-  if [ -n "${gateway_pid:-}" ] && kill -0 "$gateway_pid" 2>/dev/null; then
-    kill "$gateway_pid" 2>/dev/null || true
-    wait "$gateway_pid" 2>/dev/null || true
-  fi
-  if [ -n "${mock_pid:-}" ] && kill -0 "$mock_pid" 2>/dev/null; then
-    kill "$mock_pid" 2>/dev/null || true
-    wait "$mock_pid" 2>/dev/null || true
-  fi
+  openclaw_e2e_terminate_gateways "${gateway_pid:-}"
+  openclaw_e2e_stop_process "${mock_pid:-}"
 }
 trap cleanup EXIT
 
@@ -73,22 +67,8 @@ for _ in $(seq 1 80); do
 done
 node -e "fetch('http://127.0.0.1:${MOCK_PORT}/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))" >/dev/null
 
-node "$entry" gateway --port "$PORT" --bind loopback --allow-unconfigured >"$GATEWAY_LOG" 2>&1 &
-gateway_pid="$!"
-for _ in $(seq 1 360); do
-  if ! kill -0 "$gateway_pid" 2>/dev/null; then
-    echo "gateway exited before listening" >&2
-    exit 1
-  fi
-  if node "$entry" gateway health \
-    --url "ws://127.0.0.1:$PORT" \
-    --token "$TOKEN" \
-    --timeout 120000 \
-    --json >/dev/null 2>&1; then
-    break
-  fi
-  sleep 0.25
-done
+gateway_pid="$(openclaw_e2e_start_gateway "$entry" "$PORT" "$GATEWAY_LOG")"
+openclaw_e2e_wait_gateway_ready "$gateway_pid" "$GATEWAY_LOG" 360
 node "$entry" gateway health \
   --url "ws://127.0.0.1:$PORT" \
   --token "$TOKEN" \
diff --git a/test/scripts/docker-build-helper.test.ts b/test/scripts/docker-build-helper.test.ts
@@ -1773,6 +1773,20 @@ test -f "$TMPDIR/docker-cmd-seen"
     expect(client).not.toContain('"agent.wait"');
   });
 
+  it("cleans OpenAI web search smoke processes through the E2E helpers", () => {
+    const scenario = readFileSync(OPENAI_WEB_SEARCH_MINIMAL_SCENARIO_PATH, "utf8");
+
+    expect(scenario).toContain('openclaw_e2e_terminate_gateways "${gateway_pid:-}"');
+    expect(scenario).toContain('openclaw_e2e_stop_process "${mock_pid:-}"');
+    expect(scenario).toContain(
+      'gateway_pid="$(openclaw_e2e_start_gateway "$entry" "$PORT" "$GATEWAY_LOG")"',
+    );
+    expect(scenario).toContain('openclaw_e2e_wait_gateway_ready "$gateway_pid" "$GATEWAY_LOG" 360');
+    expect(scenario).not.toContain('kill "$gateway_pid"');
+    expect(scenario).not.toContain('kill "$mock_pid"');
+    expect(scenario).not.toContain('node "$entry" gateway --port "$PORT"');
+  });
+
   it("keeps ClawHub plugin Docker smoke hermetic by default", () => {
     const runner = readFileSync(PLUGINS_DOCKER_E2E_PATH, "utf8");
     const sweep = readFileSync(PLUGINS_DOCKER_SWEEP_PATH, "utf8");
