fix: base path problem

Author: ninjinkun

smart_tests/commands/subset.py

@@ -237,6 +237,7 @@ def subset(
     # PR merge hell. This should be moved to a top-level class
 
     TestPathWriter.base_path = base_path
+    TestPathWriter.base_path_explicitly_set = (base_path is not None)
 
     class Optimize(TestPathWriter):
         # test_paths: List[TestPath]  # doesn't work with Python 3.5
@@ -265,6 +266,11 @@ def set_test_runner(self, test_runner: str):
             """Set the test runner name for this subset operation"""
             self.test_runner = test_runner
 
+        @property
+        def base_path(self):
+            """Provide access to base_path for test runners compatibility"""
+            return TestPathWriter.base_path
+
         def _default_output_handler(self, output: list[TestPath], rests: list[TestPath]):
             if rest:
                 self.write_file(rest, rests)

smart_tests/commands/test_path_writer.py

@@ -9,6 +9,7 @@
 
 class TestPathWriter(object):
     base_path: str | None = None
+    base_path_explicitly_set: bool = False  # Track if base_path was explicitly provided
 
     def __init__(self, app: Application):
         self._formatter: Callable[[TestPath], str] = TestPathWriter.default_formatter
@@ -20,7 +21,9 @@ def __init__(self, app: Application):
     def default_formatter(cls, x: TestPath):
         """default formatter that's in line with to_test_path(str)"""
         file_name = x[0]['name']
-        if cls.base_path:
+        # Only prepend base_path if it was explicitly set via --base option
+        # Auto-inferred base paths should not affect output formatting
+        if cls.base_path and cls.base_path_explicitly_set:
             # default behavior consistent with default_path_builder's relative
             # path handling
             file_name = join(str(cls.base_path), file_name)

smart_tests/testpath.py

@@ -123,8 +123,17 @@ def _relativize(self, p: pathlib.Path) -> pathlib.Path:
 
         return p
 
+    def get_effective_base_path(self) -> str | None:
+        """Get the effective base path, either explicitly set or inferred."""
+        if self._base_path:
+            return self._base_path
+        return self._inferred_base_path
+
     def _auto_infer_base_path(self, p: pathlib.Path) -> str | None:
-        p = p.parent
+        # If p is a file, start from its parent directory
+        if p.is_file():
+            p = p.parent
+
         while p != p.root and not p.exists():
             p = p.parent
         try:

smart_tests/utils/dynamic_commands.py

@@ -136,6 +136,29 @@ def combined_function(*args, **kwargs):
             if hasattr(client, 'set_test_runner'):
                 client.set_test_runner(test_runner_name)
 
+            # Auto-infer base path if not explicitly provided for all test runners
+            # This ensures all test runners have access to base_path when needed
+            has_base_path_attr = hasattr(client, 'base_path')
+            base_path_is_none = client.base_path is None if has_base_path_attr else False
+            no_inference_disabled = not kwargs.get('no_base_path_inference', False)
+
+            if has_base_path_attr and base_path_is_none and no_inference_disabled:
+
+                # Attempt to infer base path from current working directory
+                try:
+                    import pathlib
+
+                    from smart_tests.commands.test_path_writer import TestPathWriter
+                    from smart_tests.testpath import FilePathNormalizer
+
+                    file_path_normalizer = FilePathNormalizer()
+                    inferred_base_path = file_path_normalizer._auto_infer_base_path(pathlib.Path.cwd().resolve())
+                    if inferred_base_path:
+                        TestPathWriter.base_path = inferred_base_path
+                except Exception:
+                    # If inference fails, continue with None
+                    pass
+
             # Prepare arguments for test runner function
             test_runner_args = [client]  # First argument is always client
             test_runner_kwargs = {}