From 78935a2e30ce070d564be48ea7f4259eb2923a13 Mon Sep 17 00:00:00 2001 From: Rich Chiodo Date: Wed, 15 Apr 2020 12:58:55 -0700 Subject: [PATCH] Fix failing unit tests on windows (#11191) --- .../synchronousTerminalService.unit.test.ts | 18 ++---------------- ...alEnvironmentActivationService.unit.test.ts | 6 +----- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/test/common/terminals/synchronousTerminalService.unit.test.ts b/src/test/common/terminals/synchronousTerminalService.unit.test.ts index 4d0b6be2af0d..082eeb1953ca 100644 --- a/src/test/common/terminals/synchronousTerminalService.unit.test.ts +++ b/src/test/common/terminals/synchronousTerminalService.unit.test.ts @@ -107,14 +107,7 @@ suite('Terminal Service (synchronous)', () => { verify( terminalService.sendCommand( 'python', - deepEqual([ - isolated.fileToCommandArgument(), - shellExecFile.fileToCommandArgument(), - 'cmd'.fileToCommandArgument(), - '1', - '2', - tmpFile.filePath.fileToCommandArgument() - ]) + deepEqual([isolated, shellExecFile, 'cmd', '1', '2', tmpFile.filePath.fileToCommandArgument()]) ) ).once(); }).timeout(1_000); @@ -150,14 +143,7 @@ suite('Terminal Service (synchronous)', () => { verify( terminalService.sendCommand( 'python', - deepEqual([ - isolated.fileToCommandArgument(), - shellExecFile.fileToCommandArgument(), - 'cmd'.fileToCommandArgument(), - '1', - '2', - tmpFile.filePath.fileToCommandArgument() - ]) + deepEqual([isolated, shellExecFile, 'cmd', '1', '2', tmpFile.filePath.fileToCommandArgument()]) ) ).once(); }).timeout(2_000); diff --git a/src/test/interpreters/activation/terminalEnvironmentActivationService.unit.test.ts b/src/test/interpreters/activation/terminalEnvironmentActivationService.unit.test.ts index 5789716813c6..96400cf909a2 100644 --- a/src/test/interpreters/activation/terminalEnvironmentActivationService.unit.test.ts +++ b/src/test/interpreters/activation/terminalEnvironmentActivationService.unit.test.ts @@ -104,11 +104,7 @@ suite('Interpreters Activation - Python Environment Variables (using terminals)' verify( terminal.sendCommand( cmd, - deepEqual([ - isolated.fileToCommandArgument(), - pyFile.fileToCommandArgument(), - jsonFile.fileToCommandArgument() - ]), + deepEqual([isolated, pyFile, jsonFile.fileToCommandArgument()]), anything(), false )