Fixed corner case where conftest.py wouldn't be properly gotten with …

…previous approach when running pytest.
fabioz · Apr 18, 2024 · d9bddb9 · d9bddb9
1 parent 530ac84
commit d9bddb9
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/plugins/org.python.pydev.core/pysrc/runfiles.py b/plugins/org.python.pydev.core/pysrc/runfiles.py
@@ -205,11 +205,26 @@ def dotted(p):
             # See related issue (for which we work-around below):
             # https://bitbucket.org/hpk42/pytest/issue/639/conftest-being-loaded-twice-giving
 
-            for path in sys.path:
-                path_dotted = dotted(path)
-                if curr_dotted.startswith(path_dotted):
-                    os.chdir(path)
+            found_conftest = False
+
+            curdir_abs = os.path.abspath(os.curdir)
+            while True:
+                if os.path.exists(os.path.join(curdir_abs, 'conftest.py')):
+                    os.chdir(curdir_abs)
+                    found_conftest = True
+                    break
+
+                parent = os.path.dirname(curdir_abs)
+                if curdir_abs == parent or not parent:
                     break
+                curdir_abs = parent
+
+            if not found_conftest:
+                for path in sys.path:
+                    path_dotted = dotted(path)
+                    if curr_dotted.startswith(path_dotted):
+                        os.chdir(path)
+                        break
 
             remove = []
             for i in range(len(argv)):