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

(for microsoft#6548)

Author: Eric Snow

news/2 Fixes/6548.md

@@ -0,0 +1 @@
+Force the pytest root dir to always be the workspace root folder.

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);
 

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> {

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);