Adapt error codes to match newer Windows 11 behavior

- for some OSError exceptions, errno has changed

Author: mrbean-bremen

CHANGES.md

@@ -15,6 +15,11 @@ The released versions correspond to PyPI releases.
 
 ### Unreleased
 
+## Changes
+* the `errno` codes set in `OSError` have changed for some specific error conditions
+  in Windows 11/Windows Server 2025; pyfakefs now matches this behavior
+  instead of the previous behavior under Windows 10
+
 ## Fixes
 * fixes patching of Debian-specific `tempfile` in Python 3.13 (see [#1214](../../issues/1214))
 

pyfakefs/fake_filesystem.py

@@ -770,7 +770,7 @@ def raise_for_filepath_ending_with_separator(
                     if self.is_macos and exc.errno != errno.ENOENT:
                         return
                     if self.is_windows_fs:
-                        self.raise_os_error(errno.EINVAL, entry_path)
+                        self.raise_os_error(errno.ENOTDIR, entry_path)
                     raise
                 if not follow_symlinks or self.is_windows_fs or self.is_macos:
                     file_object = link_object
@@ -781,8 +781,7 @@ def raise_for_filepath_ending_with_separator(
             else:
                 is_error = not S_ISDIR(file_object.st_mode)
             if is_error:
-                error_nr = errno.EINVAL if self.is_windows_fs else errno.ENOTDIR
-                self.raise_os_error(error_nr, entry_path)
+                self.raise_os_error(errno.ENOTDIR, entry_path)
 
     def chmod(
         self,
@@ -2004,7 +2003,7 @@ def rename(
             self.raise_os_error(errno.EXDEV, old_path)
         if not S_ISDIR(new_dir_object.st_mode):
             self.raise_os_error(
-                errno.EACCES if self.is_windows_fs else errno.ENOTDIR, new_path
+                errno.EINVAL if self.is_windows_fs else errno.ENOTDIR, new_path
             )
         if new_dir_object.has_parent_object(old_object):
             self.raise_os_error(errno.EINVAL, new_path)
@@ -2038,13 +2037,7 @@ def _handle_broken_link_with_trailing_sep(self, path: AnyStr) -> None:
         # note that the check for trailing sep has to be done earlier
         if self.islink(path):
             if not self.exists(path):
-                error = (
-                    errno.ENOENT
-                    if self.is_macos
-                    else errno.EINVAL
-                    if self.is_windows_fs
-                    else errno.ENOTDIR
-                )
+                error = errno.ENOENT if self.is_macos else errno.ENOTDIR
                 self.raise_os_error(error, path)
 
     def _handle_posix_dir_link_errors(
@@ -2080,7 +2073,7 @@ def _rename_to_existing_path(
         new_object = self._get_object(new_file_path)
         if old_file_path == new_file_path:
             if not S_ISLNK(new_object.st_mode) and ends_with_sep:
-                error = errno.EINVAL if self.is_windows_fs else errno.ENOTDIR
+                error = errno.ENOTDIR if self.is_windows_fs else errno.ENOTDIR
                 self.raise_os_error(error, old_file_path)
             return None  # Nothing to do here
 
@@ -2683,7 +2676,7 @@ def create_symlink(
                     self.raise_os_error(errno.ENOENT, link_path)
             else:
                 if self.is_windows_fs:
-                    self.raise_os_error(errno.EINVAL, link_target_path)
+                    self.raise_os_error(errno.ENOTDIR, link_target_path)
                 if not self.exists(
                     self._path_without_trailing_separators(link_path),
                     check_link=True,
@@ -2754,8 +2747,7 @@ def create_link(
                 self.raise_os_error(errno.ENOENT, new_parent_directory)
 
         if self.ends_with_path_separator(old_path_str):
-            error = errno.EINVAL if self.is_windows_fs else errno.ENOTDIR
-            self.raise_os_error(error, old_path_str)
+            self.raise_os_error(errno.ENOTDIR, old_path_str)
 
         if not self.is_windows_fs and self.ends_with_path_separator(new_path):
             self.raise_os_error(errno.ENOENT, old_path_str)
@@ -2839,7 +2831,7 @@ def readlink(self, path: AnyPath) -> str:
                 self.raise_os_error(errno.EINVAL, link_path)
             if not self.exists(link_obj.path):  # type: ignore
                 if self.is_windows_fs:
-                    error = errno.EINVAL
+                    error = errno.ENOTDIR
                 elif self._is_circular_link(link_obj):
                     if self.is_macos:
                         return link_obj.path  # type: ignore[return-value]

pyfakefs/fake_path.py

@@ -163,8 +163,7 @@ def getsize(self, path: AnyStr):
             self.filesystem.ends_with_path_separator(path)
             and S_IFMT(file_obj.st_mode) != S_IFDIR
         ):
-            error_nr = errno.EINVAL if self.filesystem.is_windows_fs else errno.ENOTDIR
-            self.filesystem.raise_os_error(error_nr, path)
+            self.filesystem.raise_os_error(errno.ENOTDIR, path)
         return file_obj.st_size
 
     def isabs(self, path: AnyStr) -> bool:

pyfakefs/tests/fake_os_test.py

@@ -521,21 +521,13 @@ def test_islink_with_trailing_sep_macos(self):
         self.os.symlink(self.base_path, link_path)
         self.assertFalse(self.os.path.islink(link_path + self.os.sep))
 
-    def check_getsize_raises_with_trailing_separator(self, error_nr):
+    def test_getsize_raises_with_trailing_separator(self):
         file_path = self.make_path("bar")
         self.create_file(file_path)
         self.assert_raises_os_error(
-            error_nr, self.os.path.getsize, file_path + self.os.sep
+            errno.ENOTDIR, self.os.path.getsize, file_path + self.os.sep
         )
 
-    def test_getsize_raises_with_trailing_separator_posix(self):
-        self.check_posix_only()
-        self.check_getsize_raises_with_trailing_separator(errno.ENOTDIR)
-
-    def test_getsize_raises_with_trailing_separator_windows(self):
-        self.check_windows_only()
-        self.check_getsize_raises_with_trailing_separator(errno.EINVAL)
-
     def check_remove_link_ending_with_sep(self, error_nr):
         # regression test for #360
         link_path = self.make_path("foo")
@@ -687,33 +679,21 @@ def test_isfile_not_readable_file(self):
         self.create_file(file_path, perm=0)
         self.assertTrue(self.os.path.isfile(file_path))
 
-    def check_stat_with_trailing_separator(self, error_nr):
+    def test_stat_with_trailing_separator(self):
         # regression test for #376
         file_path = self.make_path("foo")
         self.create_file(file_path)
-        self.assert_raises_os_error(error_nr, self.os.stat, file_path + self.os.sep)
-
-    def test_stat_with_trailing_separator_posix(self):
-        self.check_posix_only()
-        self.check_stat_with_trailing_separator(errno.ENOTDIR)
-
-    def test_stat_with_trailing_separator_windows(self):
-        self.check_windows_only()
-        self.check_stat_with_trailing_separator(errno.EINVAL)
+        self.assert_raises_os_error(
+            errno.ENOTDIR, self.os.stat, file_path + self.os.sep
+        )
 
-    def check_remove_with_trailing_separator(self, error_nr):
+    def test_remove_with_trailing_separator(self):
         # regression test for #377
         file_path = self.make_path("foo")
         self.create_file(file_path)
-        self.assert_raises_os_error(error_nr, self.os.remove, file_path + self.os.sep)
-
-    def test_remove_with_trailing_separator_posix(self):
-        self.check_posix_only()
-        self.check_remove_with_trailing_separator(errno.ENOTDIR)
-
-    def test_remove_with_trailing_separator_windows(self):
-        self.check_windows_only()
-        self.check_remove_with_trailing_separator(errno.EINVAL)
+        self.assert_raises_os_error(
+            errno.ENOTDIR, self.os.remove, file_path + self.os.sep
+        )
 
     def test_readlink(self):
         skip_if_symlink_not_supported()
@@ -790,7 +770,7 @@ def test_broken_symlink_with_trailing_separator_windows(self):
         link_path = self.make_path("link")
         self.os.symlink(file_path, link_path)
         self.assert_raises_os_error(
-            errno.EINVAL,
+            errno.ENOTDIR,
             self.os.symlink,
             link_path + self.os.sep,
             link_path + self.os.sep,
@@ -819,7 +799,7 @@ def test_circular_readlink_with_trailing_separator_windows(self):
         file_path = self.make_path("foo")
         self.os.symlink(file_path, file_path)
         self.assert_raises_os_error(
-            errno.EINVAL, self.os.readlink, file_path + self.os.sep
+            errno.ENOTDIR, self.os.readlink, file_path + self.os.sep
         )
 
     def test_readlink_with_links_in_path(self):
@@ -1125,7 +1105,7 @@ def test_rename_with_target_parent_file_raises_windows(self):
         file_path = self.make_path("foo", "baz")
         self.create_file(file_path)
         self.assert_raises_os_error(
-            errno.EACCES,
+            errno.EINVAL,
             self.os.rename,
             file_path,
             self.os.path.join(file_path, "new"),
@@ -2449,7 +2429,7 @@ def test_broken_symlink_with_trailing_sep_windows(self):
         self.check_windows_only()
         skip_if_symlink_not_supported()
         path0 = self.make_path("foo") + self.os.sep
-        self.assert_raises_os_error(errno.EINVAL, self.os.symlink, path0, path0)
+        self.assert_raises_os_error(errno.ENOTDIR, self.os.symlink, path0, path0)
 
     def test_rename_symlink_with_trailing_sep_linux(self):
         # Regression test for #391
@@ -2509,7 +2489,7 @@ def test_lstat_broken_link_with_trailing_sep_macos(self):
     def test_lstat_broken_link_with_trailing_sep_windows(self):
         self.check_windows_only()
         link_path = self.create_broken_link_path_with_trailing_sep()
-        self.assert_raises_os_error(errno.EINVAL, self.os.lstat, link_path)
+        self.assert_raises_os_error(errno.ENOTDIR, self.os.lstat, link_path)
 
     def test_mkdir_broken_link_with_trailing_sep_linux_windows(self):
         self.check_linux_and_windows()
@@ -2540,7 +2520,7 @@ def test_remove_broken_link_with_trailing_sep_macos(self):
     def test_remove_broken_link_with_trailing_sep_windows(self):
         self.check_windows_only()
         link_path = self.create_broken_link_path_with_trailing_sep()
-        self.assert_raises_os_error(errno.EINVAL, self.os.remove, link_path)
+        self.assert_raises_os_error(errno.ENOTDIR, self.os.remove, link_path)
 
     def test_rename_broken_link_with_trailing_sep_linux(self):
         self.check_linux_only()
@@ -2560,7 +2540,7 @@ def test_rename_broken_link_with_trailing_sep_windows(self):
         self.check_windows_only()
         link_path = self.create_broken_link_path_with_trailing_sep()
         self.assert_raises_os_error(
-            errno.EINVAL, self.os.rename, link_path, self.make_path("target")
+            errno.ENOTDIR, self.os.rename, link_path, self.make_path("target")
         )
 
     def test_readlink_broken_link_with_trailing_sep_posix(self):
@@ -2571,7 +2551,7 @@ def test_readlink_broken_link_with_trailing_sep_posix(self):
     def test_readlink_broken_link_with_trailing_sep_windows(self):
         self.check_windows_only()
         link_path = self.create_broken_link_path_with_trailing_sep()
-        self.assert_raises_os_error(errno.EINVAL, self.os.readlink, link_path)
+        self.assert_raises_os_error(errno.ENOTDIR, self.os.readlink, link_path)
 
     def test_islink_broken_link_with_trailing_sep(self):
         link_path = self.create_broken_link_path_with_trailing_sep()
@@ -2618,24 +2598,16 @@ def test_open_broken_symlink_to_path_with_trailing_sep_windows(self):
         self.check_windows_only()
         self.check_open_broken_symlink_to_path_with_trailing_sep(errno.EINVAL)
 
-    def check_link_path_ending_with_sep(self, error):
+    def test_link_path_ending_with_sep(self):
         # Regression tests for #399
         skip_if_symlink_not_supported()
         file_path = self.make_path("foo")
         link_path = self.make_path("link")
         with self.open(file_path, "w", encoding="utf8"):
             self.assert_raises_os_error(
-                error, self.os.link, file_path + self.os.sep, link_path
+                errno.ENOTDIR, self.os.link, file_path + self.os.sep, link_path
             )
 
-    def test_link_path_ending_with_sep_posix(self):
-        self.check_posix_only()
-        self.check_link_path_ending_with_sep(errno.ENOTDIR)
-
-    def test_link_path_ending_with_sep_windows(self):
-        self.check_windows_only()
-        self.check_link_path_ending_with_sep(errno.EINVAL)
-
     def test_link_to_path_ending_with_sep_posix(self):
         # regression test for #407
         self.check_posix_only()
@@ -2653,22 +2625,14 @@ def test_link_to_path_ending_with_sep_windows(self):
             self.os.link(path1, path0)
             self.assertTrue(self.os.path.exists(path1))
 
-    def check_rename_to_path_ending_with_sep(self, error):
+    def test_rename_to_path_ending_with_sep(self):
         # Regression tests for #400
         file_path = self.make_path("foo")
         with self.open(file_path, "w", encoding="utf8"):
             self.assert_raises_os_error(
-                error, self.os.rename, file_path + self.os.sep, file_path
+                errno.ENOTDIR, self.os.rename, file_path + self.os.sep, file_path
             )
 
-    def test_rename_to_path_ending_with_sep_posix(self):
-        self.check_posix_only()
-        self.check_rename_to_path_ending_with_sep(errno.ENOTDIR)
-
-    def test_rename_to_path_ending_with_sep_windows(self):
-        self.check_windows_only()
-        self.check_rename_to_path_ending_with_sep(errno.EINVAL)
-
     def test_rmdir_link_with_trailing_sep_linux(self):
         self.check_linux_only()
         dir_path = self.make_path("foo")
@@ -2723,7 +2687,9 @@ def test_readlink_circular_link_with_trailing_sep_windows(self):
         path0 = self.make_path("bar")
         self.os.symlink(path0, path1)
         self.os.symlink(path1, path0)
-        self.assert_raises_os_error(errno.EINVAL, self.os.readlink, path0 + self.os.sep)
+        self.assert_raises_os_error(
+            errno.ENOTDIR, self.os.readlink, path0 + self.os.sep
+        )
 
     # hard link related tests
     def test_link_bogus(self):
@@ -3510,7 +3476,7 @@ def test_rename_with_target_parent_file_raises_windows(self):
         file_path = self.make_path("foo", "baz")
         self.create_file(file_path)
         self.assert_raises_os_error(
-            errno.EACCES,
+            errno.EINVAL,
             self.os.rename,
             file_path,
             self.os.path.join(file_path.upper(), "new"),