From 507fac89f3d03d15cbc288997b9d86b3fb91b022 Mon Sep 17 00:00:00 2001 From: Elaine Vegeris Date: Wed, 10 Jul 2024 12:50:10 -0400 Subject: [PATCH] Update for Windows --- packages/cli-test/src/cli/commands/platform.ts | 7 +++++++ packages/cli-test/src/cli/shell.ts | 3 +++ 2 files changed, 10 insertions(+) diff --git a/packages/cli-test/src/cli/commands/platform.ts b/packages/cli-test/src/cli/commands/platform.ts index d592677a5..8ff309ae0 100644 --- a/packages/cli-test/src/cli/commands/platform.ts +++ b/packages/cli-test/src/cli/commands/platform.ts @@ -203,6 +203,13 @@ export default { return new Promise((resolve, reject) => { // kill the shell process shell.kill(proc).then(() => { + + // Due to the complexity of gracefully shutting down processes on Windows / lack of interrupt signal support, + // we don't wait for the SLACK_TRACE_PLATFORM_RUN_STOP trace on Windows + if (process.platform === "win32") { + resolve(); + } + if (teamName) { // TODO: this is messed up. does not match to parameter name at all - team name has nothing to do with this. // Check if local app was deleted automatically, if --cleanup was passed to `runStart` diff --git a/packages/cli-test/src/cli/shell.ts b/packages/cli-test/src/cli/shell.ts index 26d0a40cd..804e8f859 100644 --- a/packages/cli-test/src/cli/shell.ts +++ b/packages/cli-test/src/cli/shell.ts @@ -203,6 +203,9 @@ export const shell = { }, assembleShellEnv: function assembleShellEnv(): Record { const spawnedEnv = { ...process.env }; + if (process.platform === "win32"){ + spawnedEnv.PATH = process.env.PATH; + } // Always enable test trace output spawnedEnv.SLACK_TEST_TRACE = 'true'; // Skip prompts for AAA request and directly send a request