Use fully qualified paths to nodejs on CI for tests (microsoft#5308)

DonJayamanne · web-flow · commit ee5fbb690265 · 2019-04-16T12:02:45.000-07:00
diff --git a/build/ci/templates/test_phases.yml b/build/ci/templates/test_phases.yml
@@ -71,6 +71,14 @@ steps:
       verbose: true
       customCommand: 'install -g npm@$(NpmVersion)'
 
+  # On Mac, the command `node` doesn't always point to the current node version.
+  - script: |
+        export NODE_PATH=`which node`
+        echo $NODE_PATH
+        echo '##vso[task.setvariable variable=NODE_PATH]'$NODE_PATH
+    displayName: "Setup NODE_PATH for extension"
+    condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))
+
   # Install node_modules.
   # Example command line (windows pwsh):
   # > npm ci
diff --git a/src/test/debugger/misc.test.ts b/src/test/debugger/misc.test.ts
@@ -50,7 +50,7 @@ suite(`Standard Debugging - Misc tests: ${debuggerType}`, () => {
      * @returns {DebugClient}
      */
     function createDebugAdapter(): DebugClient {
-        return new DebugClient('node', testAdapterFilePath, debuggerType);
+        return new DebugClient(process.env.NODE_PATH || 'node', testAdapterFilePath, debuggerType);
     }
     function buildLaunchArgs(pythonFile: string, stopOnEntry: boolean = false, showReturnValue: boolean = false): LaunchRequestArguments {
         const env = { PYTHONPATH: PTVSD_PATH };
diff --git a/src/test/debugger/portAndHost.test.ts b/src/test/debugger/portAndHost.test.ts
@@ -31,7 +31,7 @@ suite(`Standard Debugging of ports and hosts: ${debuggerType}`, () => {
             this.skip();
         }
         await new Promise(resolve => setTimeout(resolve, 1000));
-        debugClient = new DebugClient('node', testAdapterFilePath, debuggerType);
+        debugClient = new DebugClient(process.env.NODE_PATH || 'node', testAdapterFilePath, debuggerType);
         debugClient.defaultTimeout = DEBUGGER_TIMEOUT;
         await debugClient.start();
     });
diff --git a/src/test/debugger/utils.ts b/src/test/debugger/utils.ts
@@ -24,7 +24,7 @@ const debuggerType = DebuggerTypeName;
  */
 export async function createDebugAdapter(_coverageDirectory: string): Promise<DebugClient> {
     await new Promise(resolve => setTimeout(resolve, 1000));
-    const debugClient = new DebugClient('node', testAdapterFilePath, debuggerType);
+    const debugClient = new DebugClient(process.env.NODE_PATH || 'node', testAdapterFilePath, debuggerType);
     debugClient.defaultTimeout = DEBUGGER_TIMEOUT;
     await debugClient.start();
     return debugClient;

Original file line number	Diff line number	Diff line change
@@ -50,7 +50,7 @@ suite(`Standard Debugging - Misc tests: ${debuggerType}`, () => {
`50`	`50`	`* @returns {DebugClient}`
`51`	`51`	`*/`
`52`	`52`	`function createDebugAdapter(): DebugClient {`
`53`		`- return new DebugClient('node', testAdapterFilePath, debuggerType);`
	`53`	`+ return new DebugClient(process.env.NODE_PATH \|\| 'node', testAdapterFilePath, debuggerType);`
`54`	`54`	`}`
`55`	`55`	`function buildLaunchArgs(pythonFile: string, stopOnEntry: boolean = false, showReturnValue: boolean = false): LaunchRequestArguments {`
`56`	`56`	`const env = { PYTHONPATH: PTVSD_PATH };`
Original file line number	Diff line number	Diff line change
@@ -31,7 +31,7 @@ suite(`Standard Debugging of ports and hosts: ${debuggerType}`, () => {
`31`	`31`	`this.skip();`
`32`	`32`	`}`
`33`	`33`	`await new Promise(resolve => setTimeout(resolve, 1000));`
`34`		`- debugClient = new DebugClient('node', testAdapterFilePath, debuggerType);`
	`34`	`+ debugClient = new DebugClient(process.env.NODE_PATH \|\| 'node', testAdapterFilePath, debuggerType);`
`35`	`35`	`debugClient.defaultTimeout = DEBUGGER_TIMEOUT;`
`36`	`36`	`await debugClient.start();`
`37`	`37`	`});`