test(ci): stabilize ARM changed-test guards

vincentkoc · vincentkoc · commit 52b07b4a4652 · 2026-06-04T08:18:15.000-07:00
diff --git a/src/gateway/server-restart-sentinel.test.ts b/src/gateway/server-restart-sentinel.test.ts
@@ -1173,7 +1173,7 @@ describe("scheduleRestartSentinelWake", () => {
     } as Awaited<ReturnType<typeof mocks.readRestartSentinel>>);
     mocks.recordInboundSessionAndDispatchReply.mockImplementation(async (params) => {
       attempt += 1;
-      if (attempt <= 6) {
+      if (attempt <= 2) {
         await params.deliver({ text: busyReply });
         return;
       }
@@ -1185,16 +1185,19 @@ describe("scheduleRestartSentinelWake", () => {
 
     await scheduleRestartSentinelWake({ deps: {} as never });
 
-    expect(mocks.recordInboundSessionAndDispatchReply).toHaveBeenCalledTimes(7);
+    expectMockCallFields(mocks.enqueueSessionDelivery, {
+      maxRetries: 20,
+    });
+    expect(mocks.recordInboundSessionAndDispatchReply).toHaveBeenCalledTimes(3);
     expectContinuationDispatchFields(
       {},
       { MessageSid: "restart-sentinel:agent:main:main:agentTurn:123" },
       0,
     );
     expectContinuationDispatchFields(
       {},
-      { MessageSid: "restart-sentinel:agent:main:main:agentTurn:123:retry:6" },
-      6,
+      { MessageSid: "restart-sentinel:agent:main:main:agentTurn:123:retry:2" },
+      2,
     );
     const deliveredBusyReply = (
       mocks.deliverOutboundPayloads.mock.calls as unknown as Array<
@@ -1212,7 +1215,7 @@ describe("scheduleRestartSentinelWake", () => {
       payloads: [{ text: "restart message" }],
     });
     expect(mocks.logWarn.mock.calls).toEqual(
-      Array.from({ length: 6 }, () => [
+      Array.from({ length: 2 }, () => [
         "restart continuation: retry failed for entry session-delivery-1: Error: restart continuation deferred because previous run is still shutting down",
       ]),
     );
diff --git a/src/security/audit-config-include-perms.test.ts b/src/security/audit-config-include-perms.test.ts
@@ -2,44 +2,19 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { describe, expect, it } from "vitest";
 import type { ConfigFileSnapshot } from "../config/types.openclaw.js";
-
-const inspectPathPermissionsMock = vi.hoisted(() => vi.fn());
-
-vi.mock("./audit-fs.js", () => ({
-  inspectPathPermissions: inspectPathPermissionsMock,
-  formatPermissionDetail: (targetPath: string) => `${targetPath} mocked-perms`,
-  formatPermissionRemediation: ({ targetPath }: { targetPath: string }) =>
-    `chmod 600 ${targetPath}`,
-}));
+import { collectIncludeFilePermFindings } from "./audit-extra.async.js";
 
 describe("security audit config include permissions", () => {
-  beforeEach(() => {
-    vi.resetModules();
-    inspectPathPermissionsMock.mockReset();
-  });
-
   it("flags group/world-readable config include files", async () => {
-    const { collectIncludeFilePermFindings } = await import("./audit-extra.async.js");
     const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-include-perms-"));
     const stateDir = path.join(tmp, "state");
     fs.mkdirSync(stateDir, { recursive: true, mode: 0o700 });
 
     const includePath = path.join(stateDir, "extra.json5");
     fs.writeFileSync(includePath, "{ logging: { redactSensitive: 'off' } }\n", "utf-8");
-    inspectPathPermissionsMock.mockResolvedValue({
-      ok: true,
-      isSymlink: false,
-      isDir: false,
-      mode: 0o644,
-      bits: 0o644,
-      source: "posix",
-      worldWritable: false,
-      groupWritable: false,
-      worldReadable: true,
-      groupReadable: true,
-    });
+    fs.chmodSync(includePath, 0o644);
 
     const configSnapshot: ConfigFileSnapshot = {
       path: path.join(stateDir, "openclaw.json"),
@@ -58,13 +33,9 @@ describe("security audit config include permissions", () => {
 
     const findings = await collectIncludeFilePermFindings({
       configSnapshot,
+      platform: "linux",
     });
 
-    expect(inspectPathPermissionsMock).toHaveBeenCalledWith(includePath, {
-      env: undefined,
-      exec: undefined,
-      platform: undefined,
-    });
     const finding = findings.find(
       (entry) => entry.checkId === "fs.config_include.perms_world_readable",
     );
