Expand test coverage, lean into the Windows differences a bit.

python · barneygale · Aug 25, 2024 · Jul 21, 2024 · Jul 21, 2024 · Jul 21, 2024
commit e1c0d9e7d1f5fc6a678a20c3a997c310335c52a7
diff --git a/Lib/pathlib/_local.py b/Lib/pathlib/_local.py
@@ -861,11 +861,7 @@ def move(self, target):
             if not isinstance(target, PathBase):
                 raise
         except OSError as err:
-            if err.errno == errno.EXDEV:
-                pass  # target is on another filesystem.
-            elif os.name == 'nt' and err.winerror == 5:  # ERROR_ACCESS_DENIED
-                pass  # target may have the wrong type.
-            else:
+            if err.errno != errno.EXDEV:
                 raise
         return PathBase.move(self, target)
 

@@ -36,6 +36,19 @@
     {os.open, os.stat, os.unlink, os.rmdir} <= os.supports_dir_fd and
     os.listdir in os.supports_fd and os.stat in os.supports_follow_symlinks)
 
+def patch_replace(old_test):
+    def new_replace(self, target):
+        raise OSError(errno.EXDEV, "Cross-device link", self, target)
+
+    def new_test(self):
+        old_replace = self.cls.replace
+        self.cls.replace = new_replace
+        try:
+            old_test(self)
+        finally:
+            self.cls.replace = old_replace
+    return new_test
+
 #
 # Tests for the pure classes.
 #
@@ -751,6 +764,57 @@ def test_copytree_preserve_metadata_xattrs(self):
         target_file = target.joinpath('dirD', 'fileD')
         self.assertEqual(os.getxattr(target_file, b'user.foo'), b'42')
 
+    @patch_replace
+    def test_move_file_other_fs(self):
+        self.test_move_file()
+
+    @patch_replace
+    def test_move_file_to_file_other_fs(self):
+        self.test_move_file_to_file()
+
+    @patch_replace
+    def test_move_file_to_dir_other_fs(self):
+        self.test_move_file_to_dir()
+
+    @patch_replace
+    def test_move_file_to_empty_dir_other_fs(self):
+        self.test_move_file_to_empty_dir()
+
+    @patch_replace
+    def test_move_dir_other_fs(self):
+        self.test_move_dir()
+
+    @patch_replace
+    def test_move_dir_to_file_other_fs(self):
+        self.test_move_dir_to_file()
+
+    @patch_replace
+    def test_move_dir_to_dir_other_fs(self):
+        self.test_move_dir_to_dir()
+
+    @patch_replace
+    def test_move_dir_to_empty_dir_other_fs(self):
+        self.test_move_dir_to_empty_dir()
+
+    @patch_replace
+    def test_move_dir_into_itself_other_fs(self):
+        self.test_move_dir_into_itself()
+
+    @needs_symlinks
+    @patch_replace
+    def test_move_file_symlink_other_fs(self):
+        self.test_move_file_symlink()
+
+    @needs_symlinks
+    @patch_replace
+    def test_move_dir_symlink_other_fs(self):
+        self.test_move_dir_symlink()
+
+    @needs_symlinks
+    @patch_replace
+    def test_move_dangling_symlink_other_fs(self):
+        self.test_move_dangling_symlink()
+
     def test_resolve_nonexist_relative_issue38671(self):
         p = self.cls('non', 'exist')
 

@@ -2008,14 +2008,22 @@ def test_move_file_to_dir(self):
         base = self.cls(self.base)
         source = base / 'fileA'
         target = base / 'dirB'
-        self.assertRaises(IsADirectoryError, source.move, target)
+        if self.cls.parser is posixpath:
+            exc_type = IsADirectoryError
+        else:
+            exc_type = PermissionError
+        self.assertRaises(exc_type, source.move, target)
 
     def test_move_file_to_empty_dir(self):
         base = self.cls(self.base)
         source = base / 'fileA'
         target = base / 'fileA_moved'
         target.mkdir()
-        self.assertRaises(IsADirectoryError, source.move, target)
+        if self.cls.parser is posixpath:
+            exc_type = IsADirectoryError
+        else:
+            exc_type = PermissionError
+        self.assertRaises(exc_type, source.move, target)
 
     def test_move_dir(self):
         base = self.cls(self.base)
@@ -2037,15 +2045,22 @@ def test_move_dir_to_file(self):
         base = self.cls(self.base)
         source = base / 'dirB'
         target = base / 'fileA'
-        self.assertRaises(NotADirectoryError, source.move, target)
+        if self.cls.parser is posixpath:
+            exc_type = NotADirectoryError
+        else:
+            exc_type = PermissionError
+        self.assertRaises(exc_type, source.move, target)
 
     def test_move_dir_to_dir(self):
         base = self.cls(self.base)
         source = base / 'dirC'
         target = base / 'dirB'
         with self.assertRaises(OSError) as cm:
             source.move(target)
-        self.assertEqual(cm.exception.errno, errno.ENOTEMPTY)
+        if self.cls.parser is posixpath:
+            self.assertEqual(cm.exception.errno, errno.ENOTEMPTY)
+        else:
+            self.assertEqual(cm.exception.winerror, 5)  # ERROR_ACCESS_DENIED
 
     def test_move_dir_to_empty_dir(self):
         base = self.cls(self.base)