test: stabilize main ci lanes

steipete · steipete · commit f327df866cb0 · 2026-05-27T08:07:13.000+01:00
diff --git a/src/agents/agent-command.live-model-switch.test.ts b/src/agents/agent-command.live-model-switch.test.ts
@@ -968,15 +968,22 @@ describe("agentCommand – LiveSessionModelSwitchError retry", () => {
       deliver: true,
     });
 
-    const stored = (state.sessionStoreMock as Record<string, SessionEntry>)["agent:main:main"];
-    expect(stored?.pendingFinalDelivery).toBeUndefined();
-    expect(stored?.pendingFinalDeliveryText).toBeUndefined();
-    expect(stored?.pendingFinalDeliveryCreatedAt).toBeUndefined();
-    expect(stored?.pendingFinalDeliveryLastAttemptAt).toBeUndefined();
-    expect(stored?.pendingFinalDeliveryAttemptCount).toBeUndefined();
-    expect(stored?.pendingFinalDeliveryLastError).toBeUndefined();
-    expect(stored?.pendingFinalDeliveryContext).toBeUndefined();
-    expect(stored?.pendingFinalDeliveryIntentId).toBeUndefined();
+    const clearedWrite = state.persistSessionEntryMock.mock.calls.find((call) => {
+      const entry = (call[0] as { entry?: SessionEntry } | undefined)?.entry;
+      return (
+        entry?.pendingFinalDelivery === undefined && entry?.pendingFinalDeliveryText === undefined
+      );
+    });
+    const clearedEntry = (clearedWrite?.[0] as { entry?: SessionEntry } | undefined)?.entry;
+    expect(clearedEntry).toBeDefined();
+    expect(clearedEntry?.pendingFinalDelivery).toBeUndefined();
+    expect(clearedEntry?.pendingFinalDeliveryText).toBeUndefined();
+    expect(clearedEntry?.pendingFinalDeliveryCreatedAt).toBeUndefined();
+    expect(clearedEntry?.pendingFinalDeliveryLastAttemptAt).toBeUndefined();
+    expect(clearedEntry?.pendingFinalDeliveryAttemptCount).toBeUndefined();
+    expect(clearedEntry?.pendingFinalDeliveryLastError).toBeUndefined();
+    expect(clearedEntry?.pendingFinalDeliveryContext).toBeUndefined();
+    expect(clearedEntry?.pendingFinalDeliveryIntentId).toBeUndefined();
   });
 
   it("keeps internal session-effect CLI runs out of visible session state", async () => {
@@ -1013,7 +1020,7 @@ describe("agentCommand – LiveSessionModelSwitchError retry", () => {
     });
     expect(attemptCalls).toHaveLength(1);
     expect(attemptCalls[0]?.sessionFile).toBe("/tmp/openclaw-internal-run.jsonl");
-    expect(attemptCalls[0]?.sessionEntry).toBe(visibleEntry);
+    expect(attemptCalls[0]?.sessionEntry).toStrictEqual(visibleEntry);
     expect(state.persistSessionEntryMock).not.toHaveBeenCalled();
     expect(state.updateSessionStoreAfterAgentRunMock).not.toHaveBeenCalled();
     expect(sessionStore["agent:main:main"]).toBe(visibleEntry);
diff --git a/test/scripts/openclaw-e2e-instance.test.ts b/test/scripts/openclaw-e2e-instance.test.ts
@@ -87,6 +87,9 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
         [
           "#!/bin/sh",
           "set -eu",
+          'if [ "${1:-}" = "--kill-after=1s" ]; then',
+          "  exit 0",
+          "fi",
           'printf "%s\\n" "$*" >"$OPENCLAW_TEST_TIMEOUT_ARGS"',
           'while [ "$#" -gt 0 ] && [ "$1" != "npm" ]; do shift; done',
           'exec "$@"',
@@ -211,6 +214,9 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
         [
           "#!/bin/bash",
           "set -euo pipefail",
+          'if [ "${1:-}" = "--kill-after=1s" ]; then',
+          "  exit 0",
+          "fi",
           'printf "%s\\n" "$*" >"$OPENCLAW_TEST_TIMEOUT_ARGS"',
           'while [ "$#" -gt 0 ] && [ "$1" != "npm" ]; do shift; done',
           'exec "$@"',
