Force the pytest root dir to always be the workspace root. (#7803)

(for #6548)
microsoft · Oct 8, 2019 · 9fe2a76 · 9fe2a76
1 parent 5e9eaaf
commit 9fe2a76
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/news/2 Fixes/6548.md b/news/2 Fixes/6548.md
@@ -0,0 +1 @@
+Force the pytest root dir to always be the workspace root folder.
diff --git a/src/client/testing/pytest/runner.ts b/src/client/testing/pytest/runner.ts
@@ -51,6 +51,8 @@ export class TestManagerRunner implements ITestManagerRunner {
             const testArgs = this.argsService.filterArguments(args, [JunitXmlArg]);
             testArgs.splice(0, 0, `${JunitXmlArg}=${xmlLogFile}`);
 
+            testArgs.splice(0, 0, '--rootdir', options.workspaceFolder.fsPath);
+
             // Positional arguments control the tests to be run.
             testArgs.push(...testPaths);
 

diff --git a/src/client/testing/pytest/services/discoveryService.ts b/src/client/testing/pytest/services/discoveryService.ts
@@ -48,6 +48,7 @@ export class TestDiscoveryService implements ITestDiscoveryService {
         if (args.indexOf('-s') === -1) {
             args.splice(0, 0, '-s');
         }
+        args.splice(0, 0, '--rootdir', options.workspaceFolder.fsPath);
         return args;
     }
     protected async discoverTestsInTestDirectory(options: TestDiscoveryOptions): Promise<Tests> {

diff --git a/src/test/testing/pytest/services/discoveryService.unit.test.ts b/src/test/testing/pytest/services/discoveryService.unit.test.ts
@@ -102,7 +102,11 @@ suite('Unit Tests - PyTest - Discovery', () => {
         };
 
         const filteredArgs = options.args;
-        const expectedArgs = ['-s', ...filteredArgs];
+        const expectedArgs = [
+            '--rootdir', __dirname,
+            '-s',
+            ...filteredArgs
+        ];
         when(argsService.filterArguments(deepEqual(options.args), TestFilter.discovery)).thenReturn(filteredArgs);
 
         const args = discoveryService.buildTestCollectionArgs(options);
@@ -121,7 +125,11 @@ suite('Unit Tests - PyTest - Discovery', () => {
         };
 
         const filteredArgs = options.args;
-        const expectedArgs = ['-s', ...filteredArgs];
+        const expectedArgs = [
+            '--rootdir', __dirname,
+            '-s',
+            ...filteredArgs
+        ];
         when(argsService.filterArguments(deepEqual(options.args), TestFilter.discovery)).thenReturn(filteredArgs);
 
         const args = discoveryService.buildTestCollectionArgs(options);
@@ -140,7 +148,12 @@ suite('Unit Tests - PyTest - Discovery', () => {
         };
 
         const filteredArgs = options.args;
-        const expectedArgs = ['-s', '--cache-clear', ...filteredArgs];
+        const expectedArgs = [
+            '--rootdir', __dirname,
+            '-s',
+            '--cache-clear',
+            ...filteredArgs
+        ];
         when(argsService.filterArguments(deepEqual(options.args), TestFilter.discovery)).thenReturn(filteredArgs);
 
         const args = discoveryService.buildTestCollectionArgs(options);