refactor: fix last commit according to review feedback

Author: gracetyy

tests/integration/test_race_condition_simulation.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import importlib.util
+import shutil
 import sys
 from pathlib import Path
 
@@ -15,30 +16,21 @@ def test_race_condition_simulation(tmp_path):
 
     The test verifies that no NameError is raised for _DISTUTILS_PATCH.
     """
-    venv_path = tmp_path
-
     # Create the _virtualenv.py file
-    virtualenv_file = venv_path / "_virtualenv.py"
-    source_file = Path(__file__).parent.parent / "src" / "virtualenv" / "create" / "via_global_ref" / "_virtualenv.py"
-
-    if not source_file.exists():
-        return  # Skip test if source file doesn't exist
+    virtualenv_file = tmp_path / "_virtualenv.py"
+    source_file = Path(__file__).parents[2] / "src" / "virtualenv" / "create" / "via_global_ref" / "_virtualenv.py"
 
-    content = source_file.read_text(encoding="utf-8")
-    virtualenv_file.write_text(content, encoding="utf-8")
+    shutil.copy(source_file, virtualenv_file)
 
     # Create the _virtualenv.pth file
-    pth_file = venv_path / "_virtualenv.pth"
+    pth_file = tmp_path / "_virtualenv.pth"
     pth_file.write_text("import _virtualenv", encoding="utf-8")
 
-    # Simulate the race condition by alternating between importing and overwriting
+    # Simulate the race condition by repeatedly importing
     errors = []
     for _ in range(5):
-        # Overwrite the file
-        virtualenv_file.write_text(content, encoding="utf-8")
-
         # Try to import it
-        sys.path.insert(0, str(venv_path))
+        sys.path.insert(0, str(tmp_path))
         try:
             if "_virtualenv" in sys.modules:
                 del sys.modules["_virtualenv"]
@@ -52,11 +44,7 @@ def test_race_condition_simulation(tmp_path):
                 if "_DISTUTILS_PATCH" in str(e):
                     errors.append(str(e))
         finally:
-            if str(venv_path) in sys.path:
-                sys.path.remove(str(venv_path))
-
-    # Clean up
-    if "_virtualenv" in sys.modules:
-        del sys.modules["_virtualenv"]
+            if str(tmp_path) in sys.path:
+                sys.path.remove(str(tmp_path))
 
     assert not errors, f"Race condition detected: {errors}"

tests/unit/create/via_global_ref/_test_race_condition_helper.py

@@ -0,0 +1,38 @@
+import sys
+
+class _Finder:
+    fullname = None
+    lock = []
+
+    def find_spec(self, fullname, path, target=None):
+        # This should handle the NameError gracefully
+        try:
+            distutils_patch = _DISTUTILS_PATCH  # noqa: F821
+        except NameError:
+            return None
+        if fullname in distutils_patch and self.fullname is None:
+            return None
+        return None
+
+    @staticmethod
+    def exec_module(old, module):
+        old(module)
+        try:
+            distutils_patch = _DISTUTILS_PATCH  # noqa: F821
+        except NameError:
+            return
+        if module.__name__ in distutils_patch:
+            pass  # Would call patch_dist(module)
+
+    @staticmethod
+    def load_module(old, name):
+        module = old(name)
+        try:
+            distutils_patch = _DISTUTILS_PATCH  # noqa: F821
+        except NameError:
+            return module
+        if module.__name__ in distutils_patch:
+            pass  # Would call patch_dist(module)
+        return module
+
+finder = _Finder()

tests/unit/create/via_global_ref/test_race_condition.py

@@ -1,97 +1,52 @@
 from __future__ import annotations
 
 import sys
-import tempfile
 from pathlib import Path
-from textwrap import dedent
 
 
-def test_virtualenv_py_race_condition_find_spec():
+def test_virtualenv_py_race_condition_find_spec(tmp_path):
     """Test that _Finder.find_spec handles NameError gracefully when _DISTUTILS_PATCH is not defined."""
     # Create a temporary file with partial _virtualenv.py content (simulating race condition)
-    with tempfile.TemporaryDirectory() as tmpdir:
-        venv_file = Path(tmpdir) / "_virtualenv_test.py"
-
-        # Write a partial version of _virtualenv.py that has _Finder but not _DISTUTILS_PATCH
-        # This simulates the state during a race condition where the file is being rewritten
-        partial_content = dedent("""
-            import sys
-
-            class _Finder:
-                fullname = None
-                lock = []
-
-                def find_spec(self, fullname, path, target=None):
-                    # This should handle the NameError gracefully
-                    try:
-                        distutils_patch = _DISTUTILS_PATCH  # noqa: F821
-                    except NameError:
-                        return None
-                    if fullname in distutils_patch and self.fullname is None:
-                        return None
-                    return None
-
-                @staticmethod
-                def exec_module(old, module):
-                    old(module)
-                    try:
-                        distutils_patch = _DISTUTILS_PATCH  # noqa: F821
-                    except NameError:
-                        return
-                    if module.__name__ in distutils_patch:
-                        pass  # Would call patch_dist(module)
-
-                @staticmethod
-                def load_module(old, name):
-                    module = old(name)
-                    try:
-                        distutils_patch = _DISTUTILS_PATCH  # noqa: F821
-                    except NameError:
-                        return module
-                    if module.__name__ in distutils_patch:
-                        pass  # Would call patch_dist(module)
-                    return module
-
-            finder = _Finder()
-        """)
-
-        venv_file.write_text(partial_content, encoding="utf-8")
-
-        # Add the directory to sys.path temporarily
-        sys.path.insert(0, tmpdir)
-        try:
-            # Import the module
-            import _virtualenv_test  # noqa: PLC0415
-
-            # Get the finder instance
-            finder = _virtualenv_test.finder
-
-            # Try to call find_spec - this should not raise NameError
-            result = finder.find_spec("distutils.dist", None)
-            assert result is None, "find_spec should return None when _DISTUTILS_PATCH is not defined"
-
-            # Create a mock module object
-            class MockModule:
-                __name__ = "distutils.dist"
-
-            # Try to call exec_module - this should not raise NameError
-            def mock_old_exec(_x):
-                pass
-
-            finder.exec_module(mock_old_exec, MockModule())
-
-            # Try to call load_module - this should not raise NameError
-            def mock_old_load(_name):
-                return MockModule()
-
-            result = finder.load_module(mock_old_load, "distutils.dist")
-            assert result.__name__ == "distutils.dist"
-
-        finally:
-            # Clean up
-            sys.path.remove(tmpdir)
-            if "_virtualenv_test" in sys.modules:
-                del sys.modules["_virtualenv_test"]
+    venv_file = tmp_path / "_virtualenv_test.py"
+
+    # Write a partial version of _virtualenv.py that has _Finder but not _DISTUTILS_PATCH
+    # This simulates the state during a race condition where the file is being rewritten
+    helper_file = Path(__file__).parent / "_test_race_condition_helper.py"
+    partial_content = helper_file.read_text(encoding="utf-8")
+
+    venv_file.write_text(partial_content, encoding="utf-8")
+
+    sys.path.insert(0, str(tmp_path))
+    try:
+        import _virtualenv_test  # noqa: PLC0415
+
+        finder = _virtualenv_test.finder
+
+        # Try to call find_spec - this should not raise NameError
+        result = finder.find_spec("distutils.dist", None)
+        assert result is None, "find_spec should return None when _DISTUTILS_PATCH is not defined"
+
+        # Create a mock module object
+        class MockModule:
+            __name__ = "distutils.dist"
+
+        # Try to call exec_module - this should not raise NameError
+        def mock_old_exec(_x):
+            pass
+
+        finder.exec_module(mock_old_exec, MockModule())
+
+        # Try to call load_module - this should not raise NameError
+        def mock_old_load(_name):
+            return MockModule()
+
+        result = finder.load_module(mock_old_load, "distutils.dist")
+        assert result.__name__ == "distutils.dist"
+
+    finally:
+        sys.path.remove(str(tmp_path))
+        if "_virtualenv_test" in sys.modules:
+            del sys.modules["_virtualenv_test"]
 
 
 def test_virtualenv_py_normal_operation():