Add relpath test for Windows error coverage

m-rsha · m-rsha · commit 7454d6cad9b5 · 2022-10-30T18:58:09.000-05:00
diff --git a/pre_commit/main.py b/pre_commit/main.py
@@ -165,14 +165,15 @@ def _adjust_args_and_chdir(args: argparse.Namespace) -> None:
     toplevel = git.get_root()
     os.chdir(toplevel)
 
-    try:
-        args.config = os.path.relpath(args.config)
     # https://github.com/pre-commit/pre-commit/issues/2530
     # os.relpath will fail with a ValueError if the two directories are on
     # two different drives on Windows and since the path is made relative
-    # for display purposes only we can ignore the error
+    # for display purposes only, we can ignore the error
+    try:
+        args.config = os.path.relpath(args.config)
     except ValueError:
         pass
+
     if args.command in {'run', 'try-repo'}:
         args.files = [os.path.relpath(filename) for filename in args.files]
         if args.commit_msg_filename is not None:
diff --git a/tests/main_test.py b/tests/main_test.py
@@ -27,6 +27,13 @@ def test_adjust_args_and_chdir_not_in_git_dir(in_tmpdir):
         main._adjust_args_and_chdir(_args())
 
 
+def test_adjust_args_and_chdir_relpath_to_different_drive():
+    args = _args(command='run', files=['f1', 'f2'])
+    with mock.patch.object(os.path, 'relpath', side_effect=ValueError):
+        with pytest.raises(ValueError):
+            main._adjust_args_and_chdir(args)
+
+
 def test_adjust_args_and_chdir_noop(in_git_dir):
     args = _args(command='run', files=['f1', 'f2'])
     main._adjust_args_and_chdir(args)
