@@ -62,10 +62,15 @@ import {
6262validateCliArgs,
6363waitForGatewayReady,
6464} from "../../scripts/e2e/kitchen-sink-rpc-walk.mjs";
65+import { resolveWindowsTaskkillPath } from "../../scripts/lib/windows-taskkill.mjs";
6566import { cleanupTempDirs, makeTempDir } from "../helpers/temp-dir.js";
66676768const posixIt = process.platform === "win32" ? it.skip : it;
686970+function expectedTaskkillPath(): string {
71+return resolveWindowsTaskkillPath();
72+}
73+6974afterEach(() => {
7075vi.restoreAllMocks();
7176vi.useRealTimers();
@@ -296,19 +301,29 @@ describe("kitchen-sink RPC gateway teardown", () => {
296301 runTaskkill,
297302}),
298303).toBe(true);
299-expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
300-stdio: "ignore",
301-});
304+expect(runTaskkill).toHaveBeenNthCalledWith(
305+1,
306+expectedTaskkillPath(),
307+["/PID", "12345", "/T"],
308+{
309+stdio: "ignore",
310+},
311+);
302312303313expect(
304314signalGateway(child, "SIGKILL", killProcess, {
305315platform: "win32",
306316 runTaskkill,
307317}),
308318).toBe(true);
309-expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
310-stdio: "ignore",
311-});
319+expect(runTaskkill).toHaveBeenNthCalledWith(
320+2,
321+expectedTaskkillPath(),
322+["/PID", "12345", "/T", "/F"],
323+{
324+stdio: "ignore",
325+},
326+);
312327expect(killProcess).not.toHaveBeenCalled();
313328expect(child.kill).not.toHaveBeenCalled();
314329});
@@ -331,12 +346,22 @@ describe("kitchen-sink RPC gateway teardown", () => {
331346}),
332347).toBe(true);
333348334-expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
335-stdio: "ignore",
336-});
337-expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
338-stdio: "ignore",
339-});
349+expect(runTaskkill).toHaveBeenNthCalledWith(
350+1,
351+expectedTaskkillPath(),
352+["/PID", "12345", "/T"],
353+{
354+stdio: "ignore",
355+},
356+);
357+expect(runTaskkill).toHaveBeenNthCalledWith(
358+2,
359+expectedTaskkillPath(),
360+["/PID", "12345", "/T", "/F"],
361+{
362+stdio: "ignore",
363+},
364+);
340365expect(killProcess).not.toHaveBeenCalled();
341366expect(child.kill).not.toHaveBeenCalled();
342367});
@@ -702,17 +727,27 @@ setInterval(() => {}, 1000);
702727platform: "win32",
703728 runTaskkill,
704729});
705-expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
706-stdio: "ignore",
707-});
730+expect(runTaskkill).toHaveBeenNthCalledWith(
731+1,
732+expectedTaskkillPath(),
733+["/PID", "12345", "/T"],
734+{
735+stdio: "ignore",
736+},
737+);
708738709739signalProcessGroup(child, "SIGKILL", {
710740platform: "win32",
711741 runTaskkill,
712742});
713-expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
714-stdio: "ignore",
715-});
743+expect(runTaskkill).toHaveBeenNthCalledWith(
744+2,
745+expectedTaskkillPath(),
746+["/PID", "12345", "/T", "/F"],
747+{
748+stdio: "ignore",
749+},
750+);
716751expect(child.kill).not.toHaveBeenCalled();
717752});
718753@@ -731,12 +766,22 @@ setInterval(() => {}, 1000);
731766 runTaskkill,
732767});
733768734-expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
735-stdio: "ignore",
736-});
737-expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
738-stdio: "ignore",
739-});
769+expect(runTaskkill).toHaveBeenNthCalledWith(
770+1,
771+expectedTaskkillPath(),
772+["/PID", "12345", "/T"],
773+{
774+stdio: "ignore",
775+},
776+);
777+expect(runTaskkill).toHaveBeenNthCalledWith(
778+2,
779+expectedTaskkillPath(),
780+["/PID", "12345", "/T", "/F"],
781+{
782+stdio: "ignore",
783+},
784+);
740785expect(child.kill).not.toHaveBeenCalled();
741786});
742787此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。