@@ -5,11 +5,16 @@ import os from "node:os";
55import path from "node:path";
66import { pathToFileURL } from "node:url";
77import { afterEach, describe, expect, it, vi } from "vitest";
8+import { resolveWindowsTaskkillPath } from "../../scripts/lib/windows-taskkill.mjs";
89910const tempDirs: string[] = [];
1011const harnessPath = path.resolve("test/scripts/fixtures/secret-provider-integrations-harness.mjs");
1112const proofScriptPath = path.resolve("scripts/e2e/secret-provider-integrations.mjs");
121314+function expectedTaskkillPath(): string {
15+return resolveWindowsTaskkillPath();
16+}
17+1318function makeTempDir(): string {
1419const root = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-secret-provider-proof-"));
1520tempDirs.push(root);
@@ -585,17 +590,27 @@ describe("secret provider integration proof harness", () => {
585590platform: "win32",
586591 runTaskkill,
587592});
588-expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
589-stdio: "ignore",
590-});
593+expect(runTaskkill).toHaveBeenNthCalledWith(
594+1,
595+expectedTaskkillPath(),
596+["/PID", "12345", "/T"],
597+{
598+stdio: "ignore",
599+},
600+);
591601592602proof.terminateProcessTree(child, "SIGKILL", {
593603platform: "win32",
594604 runTaskkill,
595605});
596-expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
597-stdio: "ignore",
598-});
606+expect(runTaskkill).toHaveBeenNthCalledWith(
607+2,
608+expectedTaskkillPath(),
609+["/PID", "12345", "/T", "/F"],
610+{
611+stdio: "ignore",
612+},
613+);
599614expect(child.kill).not.toHaveBeenCalled();
600615});
601616@@ -617,12 +632,22 @@ describe("secret provider integration proof harness", () => {
617632 runTaskkill,
618633});
619634620-expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
621-stdio: "ignore",
622-});
623-expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
624-stdio: "ignore",
625-});
635+expect(runTaskkill).toHaveBeenNthCalledWith(
636+1,
637+expectedTaskkillPath(),
638+["/PID", "12345", "/T"],
639+{
640+stdio: "ignore",
641+},
642+);
643+expect(runTaskkill).toHaveBeenNthCalledWith(
644+2,
645+expectedTaskkillPath(),
646+["/PID", "12345", "/T", "/F"],
647+{
648+stdio: "ignore",
649+},
650+);
626651expect(child.kill).not.toHaveBeenCalled();
627652});
628653@@ -640,17 +665,27 @@ describe("secret provider integration proof harness", () => {
640665platform: "win32",
641666 runTaskkill,
642667});
643-expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
644-stdio: "ignore",
645-});
668+expect(runTaskkill).toHaveBeenNthCalledWith(
669+1,
670+expectedTaskkillPath(),
671+["/PID", "12345", "/T"],
672+{
673+stdio: "ignore",
674+},
675+);
646676647677proof.signalPtyProcessTree(child, "SIGKILL", {
648678platform: "win32",
649679 runTaskkill,
650680});
651-expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
652-stdio: "ignore",
653-});
681+expect(runTaskkill).toHaveBeenNthCalledWith(
682+2,
683+expectedTaskkillPath(),
684+["/PID", "12345", "/T", "/F"],
685+{
686+stdio: "ignore",
687+},
688+);
654689expect(child.kill).not.toHaveBeenCalled();
655690});
656691此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。