Don't override user provided --rootdir in pytest args. (#17509)

Author: karthiknadig

news/2 Fixes/8678.md

@@ -0,0 +1 @@
+Don't override user provided `--rootdir` in pytest args.

src/client/testing/testController/pytest/arguments.ts

@@ -217,7 +217,6 @@ function pytestFilterArguments(args: string[], argumentToRemoveOrFilter: string[
                         '--verbosity',
                         '-r',
                         '--tb',
-                        '--rootdir',
                         '--show-capture',
                         '--durations',
                         '--junit-xml',
@@ -277,6 +276,10 @@ export function preparePytestArgumentsForDiscovery(options: TestDiscoveryOptions
     if (args.indexOf('-s') === -1) {
         args.splice(0, 0, '-s');
     }
-    args.splice(0, 0, '--rootdir', options.workspaceFolder.fsPath);
+
+    // Only add --rootdir if user has not already provided one
+    if (args.filter((a) => a.startsWith('--rootdir')).length === 0) {
+        args.splice(0, 0, '--rootdir', options.cwd);
+    }
     return args;
 }

src/client/testing/testController/pytest/runner.ts

@@ -86,8 +86,11 @@ export class PytestRunner implements ITestsRunner {
             // Ensure that we use the xunit1 format.
             testArgs.splice(0, 0, '--override-ini', 'junit_family=xunit1');
 
-            // Make sure root dir is set so pytest can find the relative paths
-            testArgs.splice(0, 0, '--rootdir', options.workspaceFolder.fsPath);
+            // if user has provided `--rootdir` then use that, otherwise add `cwd`
+            if (testArgs.filter((a) => a.startsWith('--rootdir')).length === 0) {
+                // Make sure root dir is set so pytest can find the relative paths
+                testArgs.splice(0, 0, '--rootdir', options.workspaceFolder.fsPath);
+            }
 
             // Positional arguments control the tests to be run.
             const rawData = idToRawData.get(testNode.id);