Run drive-rooted tests on their target drive

Author: codex

test/test_config.py

@@ -13,7 +13,7 @@
 
 from git import GitConfigParser
 from git.config import _OMD, cp
-from git.util import rmfile
+from git.util import cwd, rmfile
 
 from test.lib import SkipTest, TestCase, fixture_path, with_rw_directory
 
@@ -376,17 +376,18 @@ def test_config_relative_path_include(self, rw_dir):
     @pytest.mark.skipif(os.name != "nt", reason="Specifically for Windows drive-rooted paths.")
     @with_rw_directory
     def test_config_drive_rooted_path_include(self, rw_dir):
-        included_path = osp.join(rw_dir, "included")
-        with GitConfigParser(included_path, read_only=False) as cw:
-            cw.set_value("included", "value", "included")
-
-        _drive, rooted_included_path = osp.splitdrive(included_path)
-        config_path = osp.join(rw_dir, "config")
-        with GitConfigParser(config_path, read_only=False) as cw:
-            cw.set_value("include", "path", rooted_included_path)
-
-        with GitConfigParser(config_path, read_only=True) as cr:
-            assert cr.get_value("included", "value") == "included"
+        with cwd(rw_dir):
+            included_path = osp.join(rw_dir, "included")
+            with GitConfigParser(included_path, read_only=False) as cw:
+                cw.set_value("included", "value", "included")
+
+            _drive, rooted_included_path = osp.splitdrive(included_path)
+            config_path = osp.join(rw_dir, "config")
+            with GitConfigParser(config_path, read_only=False) as cw:
+                cw.set_value("include", "path", rooted_included_path)
+
+            with GitConfigParser(config_path, read_only=True) as cr:
+                assert cr.get_value("included", "value") == "included"
 
     @with_rw_directory
     def test_multiple_include_paths_with_same_key(self, rw_dir):

test/test_repo.py

@@ -238,11 +238,8 @@ def test_clone_from_keeps_env(self, rw_dir):
     @with_rw_directory
     def test_clone_from_drive_rooted_destination(self, rw_dir):
         original_repo = Repo.init(osp.join(rw_dir, "repo"))
-
-        # Drive-rooted paths resolve on the current drive. Keep the destination
-        # there even when the system temporary directory uses another drive.
-        with tempfile.TemporaryDirectory(dir=os.getcwd()) as destination_root:
-            destination = osp.join(destination_root, "clone")
+        with cwd(rw_dir):
+            destination = osp.join(rw_dir, "clone")
             _drive, rooted_destination = osp.splitdrive(destination)
 
             cloned = Repo.clone_from(original_repo.git_dir, rooted_destination)
@@ -1240,21 +1237,22 @@ def test_git_work_tree_dotgit_relative(self):
     @pytest.mark.skipif(os.name != "nt", reason="Specifically for Windows drive-rooted paths.")
     @with_rw_directory
     def test_linked_worktree_drive_rooted_gitdir_file(self, rw_dir):
-        main_repo = self.rorepo.clone(join_path_native(rw_dir, "main_repo"))
-        branch = main_repo.create_head("drive-rooted-worktree")
-        worktree_path = join_path_native(rw_dir, "worktree_repo")
-        main_repo.git.worktree("add", worktree_path, branch.name)
-
-        linked_repo = Repo(worktree_path)
-        gitdir_file = osp.join(linked_repo.git_dir, "gitdir")
-        worktree_gitfile = osp.join(worktree_path, ".git")
-        _drive, rooted_worktree_gitfile = osp.splitdrive(worktree_gitfile)
-        with open(gitdir_file, "w") as stream:
-            stream.write(rooted_worktree_gitfile)
-
-        reopened_repo = Repo(linked_repo.git_dir)
-
-        assert osp.samefile(reopened_repo.working_tree_dir, worktree_path)
+        with cwd(rw_dir):
+            main_repo = self.rorepo.clone(join_path_native(rw_dir, "main_repo"))
+            branch = main_repo.create_head("drive-rooted-worktree")
+            worktree_path = join_path_native(rw_dir, "worktree_repo")
+            main_repo.git.worktree("add", worktree_path, branch.name)
+
+            linked_repo = Repo(worktree_path)
+            gitdir_file = osp.join(linked_repo.git_dir, "gitdir")
+            worktree_gitfile = osp.join(worktree_path, ".git")
+            _drive, rooted_worktree_gitfile = osp.splitdrive(worktree_gitfile)
+            with open(gitdir_file, "w") as stream:
+                stream.write(rooted_worktree_gitfile)
+
+            reopened_repo = Repo(linked_repo.git_dir)
+
+            assert osp.samefile(reopened_repo.working_tree_dir, worktree_path)
 
     @with_rw_directory
     def test_git_work_tree_env(self, rw_dir):

test/test_submodule.py

@@ -26,7 +26,7 @@
 from git.objects.submodule.base import Submodule
 from git.objects.submodule.root import RootModule, RootUpdateProgress
 from git.repo.fun import find_submodule_git_dir, touch
-from git.util import HIDE_WINDOWS_KNOWN_ERRORS, join_path_native, to_native_path_linux
+from git.util import HIDE_WINDOWS_KNOWN_ERRORS, cwd, join_path_native, to_native_path_linux
 
 from test.lib import TestBase, with_rw_directory, with_rw_repo, PathLikeMock
 
@@ -1299,16 +1299,17 @@ class Repo:
     @skipUnless(sys.platform == "win32", "Specifically for Windows.")
     @with_rw_directory
     def test_find_submodule_git_dir_with_drive_rooted_gitfile(self, rwdir):
-        module = git.Repo.init(osp.join(rwdir, "module"))
-        _drive, rooted_git_dir = osp.splitdrive(module.git_dir)
-        gitfile = osp.join(rwdir, "gitfile")
-        with open(gitfile, "w") as stream:
-            stream.write(f"gitdir: {rooted_git_dir}")
+        with cwd(rwdir):
+            module = git.Repo.init(osp.join(rwdir, "module"))
+            _drive, rooted_git_dir = osp.splitdrive(module.git_dir)
+            gitfile = osp.join(rwdir, "gitfile")
+            with open(gitfile, "w") as stream:
+                stream.write(f"gitdir: {rooted_git_dir}")
 
-        resolved_git_dir = find_submodule_git_dir(gitfile)
+            resolved_git_dir = find_submodule_git_dir(gitfile)
 
-        assert resolved_git_dir is not None
-        assert osp.samefile(resolved_git_dir, module.git_dir)
+            assert resolved_git_dir is not None
+            assert osp.samefile(resolved_git_dir, module.git_dir)
 
     @pytest.mark.xfail(
         reason="for some unknown reason the assertion fails, even though it in fact is working in more common setup",