test(gmail): narrow renewal rejection coverage

vincentkoc · vincentkoc · commit b7f04da8eecd · 2026-07-05T22:14:43.000-07:00
diff --git a/scripts/proof/gmail-watcher-renewal-catch.mts b/scripts/proof/gmail-watcher-renewal-catch.mts
diff --git a/src/hooks/gmail-ops.test.ts b/src/hooks/gmail-ops.test.ts
@@ -1,4 +1,3 @@
-// Foreground Gmail service tests cover `openclaw webhooks gmail run` behavior.
 import { EventEmitter } from "node:events";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -82,44 +81,38 @@ describe("runGmailService", () => {
     mocks.spawn.mockReset();
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     vi.useRealTimers();
-    // Reset any leftover handlers from the previous run.
-    vi.restoreAllMocks();
   });
 
-  it("catches renewal interval errors instead of letting them become unhandled rejections", async () => {
+  it("logs rejected renewal commands", async () => {
     vi.useFakeTimers();
-    const unhandled: unknown[] = [];
-    const onUnhandled = (reason: unknown) => unhandled.push(reason);
-    process.on("unhandledRejection", onUnhandled);
-
-    // Initial watch start succeeds; every renewal throws.
     mocks.runCommandWithTimeout
       .mockResolvedValueOnce({ code: 0, stdout: "", stderr: "" })
       .mockRejectedValue(new Error("renewal failed"));
 
     const child = new EventEmitter();
-    const kill = vi.fn((signal: string) => {
-      queueMicrotask(() => child.emit("exit", null, signal));
+    const kill = vi.fn(() => {
+      child.emit("exit", null, "SIGTERM");
       return true;
     });
     mocks.spawn.mockReturnValue(Object.assign(child, { kill, killed: false }));
 
-    // Start the service without awaiting; it runs until we signal shutdown.
-    const servicePromise = runGmailService({} as never);
-
-    // Advance one full renewal cycle to trigger the interval callback.
-    await vi.advanceTimersByTimeAsync(720 * 60_000);
-
-    // Shut down so the test can finish.
-    process.emit("SIGINT", "SIGINT");
-    await servicePromise.catch(() => {
-      // The service may reject on forced shutdown; we only care about unhandled rejections.
-    });
-
-    process.off("unhandledRejection", onUnhandled);
-
-    expect(unhandled).toHaveLength(0);
+    const existingSigintListeners = new Set(process.rawListeners("SIGINT"));
+    let shutdown: (() => void) | undefined;
+    try {
+      await runGmailService({});
+      shutdown = process
+        .rawListeners("SIGINT")
+        .find((listener) => !existingSigintListeners.has(listener)) as (() => void) | undefined;
+
+      await vi.advanceTimersByTimeAsync(720 * 60_000);
+
+      expect(mocks.defaultRuntime.error).toHaveBeenCalledWith(
+        "gmail watch renew failed: Error: renewal failed",
+      );
+    } finally {
+      shutdown?.();
+    }
   });
 });
diff --git a/src/hooks/gmail-watcher.test.ts b/src/hooks/gmail-watcher.test.ts
@@ -277,32 +277,6 @@ describe("startGmailWatcher", () => {
     }
   });
 
-  it("catches renewal interval errors instead of letting them become unhandled rejections", async () => {
-    vi.useFakeTimers();
-    const unhandled: unknown[] = [];
-    const onUnhandled = (reason: unknown) => unhandled.push(reason);
-    process.on("unhandledRejection", onUnhandled);
-    try {
-      let callCount = 0;
-      mocks.runCommandWithTimeout.mockImplementation(async () => {
-        callCount += 1;
-        if (callCount === 1) {
-          return { code: 0, stdout: "", stderr: "" };
-        }
-        throw new Error("renewal failed");
-      });
-
-      await startGmailWatcher(createGmailConfig());
-      // Advance one full renewal cycle to trigger the interval callback.
-      await vi.advanceTimersByTimeAsync(720 * 60_000);
-
-      expect(unhandled).toHaveLength(0);
-    } finally {
-      process.off("unhandledRejection", onUnhandled);
-      vi.useRealTimers();
-    }
-  });
-
   it("escalates to SIGKILL and resolves on final timeout when process ignores signals", async () => {
     vi.useFakeTimers();
     try {
diff --git a/src/hooks/gmail-watcher.ts b/src/hooks/gmail-watcher.ts
@@ -360,9 +360,7 @@ export async function startGmailWatcher(
     if (shuttingDown) {
       return;
     }
-    void startGmailWatch(runtimeConfig).catch((err: unknown) => {
-      log.warn(`gmail watch renew failed: ${String(err)}`);
-    });
+    void startGmailWatch(runtimeConfig);
   }, renewMs);
 
   log.info(
