dilim/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-08 02:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(qa): force taskkill telegram credential trees on windows

Browse Source
This commit is contained in:
Vincent Koc
2026-06-21 07:44:10 +02:00
parent 29033e67af
commit c8b48c78d0
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/e2e/telegram-user-credential-io.ts
View File

@@ -273,9 +273,15 @@ export function signalChildProcessTree(
args.push("/F");
}
const result = runTaskkill("taskkill", args, { stdio: "ignore" });
if (!result.error && result.status === 0) {
if (!result?.error && result?.status === 0) {
return;
}
if (signal !== "SIGKILL") {
const forceResult = runTaskkill("taskkill", [...args, "/F"], { stdio: "ignore" });
if (!forceResult?.error && forceResult?.status === 0) {
return;
}
}
}
child.kill(signal);
}

24
test/scripts/telegram-user-credential.test.ts
View File

@@ -432,6 +432,30 @@ setInterval(() => {}, 1000);
expect(child.kill).not.toHaveBeenCalled();
});
it("force-kills Windows credential helper process trees when graceful taskkill fails", () => {
const child = {
kill: vi.fn(),
pid: 12345,
};
const runTaskkill = vi
.fn()
.mockReturnValueOnce({ error: undefined, status: 1 })
.mockReturnValueOnce({ error: undefined, status: 0 });
signalChildProcessTree(child, "SIGTERM", {
platform: "win32",
runTaskkill,
});
expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
stdio: "ignore",
});
expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
stdio: "ignore",
});
expect(child.kill).not.toHaveBeenCalled();
});
it.runIf(process.platform !== "win32")(
"exits promptly after forwarded SIGTERM children exit cleanly",
async () => {