@@ -15,10 +15,15 @@ import {
1515resolvePrivateJsonDirectory,
1616writePrivateJson,
1717} from "../../scripts/e2e/telegram-user-credential-paths.ts";
18+import { resolveWindowsTaskkillPath } from "../../scripts/lib/windows-taskkill.mjs";
18191920const tempDirs: string[] = [];
2021const CHUNKED_PAYLOAD_MARKER = "__openclawQaCredentialPayloadChunksV1";
212223+function expectedTaskkillPath(): string {
24+return resolveWindowsTaskkillPath();
25+}
26+2227function makeTempDir(prefix: string) {
2328const dir = mkdtempSync(path.join(tmpdir(), prefix));
2429tempDirs.push(dir);
@@ -418,17 +423,27 @@ setInterval(() => {}, 1000);
418423platform: "win32",
419424 runTaskkill,
420425});
421-expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
422-stdio: "ignore",
423-});
426+expect(runTaskkill).toHaveBeenNthCalledWith(
427+1,
428+expectedTaskkillPath(),
429+["/PID", "12345", "/T"],
430+{
431+stdio: "ignore",
432+},
433+);
424434425435signalChildProcessTree(child, "SIGKILL", {
426436platform: "win32",
427437 runTaskkill,
428438});
429-expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
430-stdio: "ignore",
431-});
439+expect(runTaskkill).toHaveBeenNthCalledWith(
440+2,
441+expectedTaskkillPath(),
442+["/PID", "12345", "/T", "/F"],
443+{
444+stdio: "ignore",
445+},
446+);
432447expect(child.kill).not.toHaveBeenCalled();
433448});
434449@@ -447,12 +462,22 @@ setInterval(() => {}, 1000);
447462 runTaskkill,
448463});
449464450-expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
451-stdio: "ignore",
452-});
453-expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
454-stdio: "ignore",
455-});
465+expect(runTaskkill).toHaveBeenNthCalledWith(
466+1,
467+expectedTaskkillPath(),
468+["/PID", "12345", "/T"],
469+{
470+stdio: "ignore",
471+},
472+);
473+expect(runTaskkill).toHaveBeenNthCalledWith(
474+2,
475+expectedTaskkillPath(),
476+["/PID", "12345", "/T", "/F"],
477+{
478+stdio: "ignore",
479+},
480+);
456481expect(child.kill).not.toHaveBeenCalled();
457482});
458483此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。