Fix tests on Windows.

Author: serhiy-storchaka

Lib/test/test_ntpath.py

@@ -437,6 +437,34 @@ def test_realpath_strict(self):
         # gh-106242: Embedded nulls should raise OSError (not ValueError)
         self.assertRaises(OSError, ntpath.realpath, ABSTFN + "\0spam", strict=True)
 
+    @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
+    def test_realpath_embedded_null(self):
+        realpath = ntpath.realpath
+        ABSTFN = ntpath.abspath(os_helper.TESTFN)
+        path = ABSTFN + '\x00'
+        self.assertEqual(realpath(path, strict=False), path)
+        self.assertRaises(OSError, realpath, path, strict=True)
+        path = os.fsencode(ABSTFN) + b'\x00'
+        self.assertEqual(realpath(path, strict=False), path)
+        self.assertRaises(OSError, realpath, path, strict=True)
+        path = ABSTFN + '\\nonexistent\\x\x00'
+        self.assertEqual(realpath(path, strict=False), path)
+        self.assertRaises(OSError, realpath, path, strict=True)
+        path = os.fsencode(ABSTFN) + b'\\nonexistent\\x\x00'
+        self.assertEqual(realpath(path, strict=False), path)
+        self.assertRaises(OSError, realpath, path, strict=True)
+
+    @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
+    def test_realpath_undecodable(self):
+        realpath = ntpath.realpath
+        ABSTFN = ntpath.abspath(os_helper.TESTFN)
+        path = os.fsencode(ABSTFN) + b'\xff'
+        self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
+        self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
+        path = os.fsencode(ABSTFN) + b'\\nonexistent\\\xff'
+        self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
+        self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
+
     @os_helper.skip_unless_symlink
     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
     def test_realpath_relative(self):

Lib/test/test_posixpath.py

@@ -489,11 +489,37 @@ def test_realpath_strict(self):
         finally:
             os_helper.unlink(ABSTFN)
 
+    def test_realpath_embedded_null(self):
+        path = '/\x00'
+        self.assertRaises(ValueError, realpath, path, strict=False)
+        self.assertRaises(ValueError, realpath, path, strict=True)
+        path = b'/\x00'
+        self.assertRaises(ValueError, realpath, path, strict=False)
+        self.assertRaises(ValueError, realpath, path, strict=True)
+        path = '/nonexistent/x\x00'
+        self.assertRaises(ValueError, realpath, path, strict=False)
+        self.assertRaises(FileNotFoundError, realpath, path, strict=True)
+        path = b'/nonexistent/x\x00'
+        self.assertRaises(ValueError, realpath, path, strict=False)
+        self.assertRaises(FileNotFoundError, realpath, path, strict=True)
+
+    @unittest.skipIf(sys.platform == 'win32', 'requires native bytes paths')
     def test_realpath_unencodable(self):
-        self.assertRaises(ValueError, realpath, 'test\0', strict=False)
-        self.assertRaises(ValueError, realpath, 'test\0', strict=True)
-        self.assertRaises(UnicodeEncodeError, realpath, '\ud800', strict=False)
-        self.assertRaises(UnicodeEncodeError, realpath, '\ud800', strict=True)
+        path = '/\ud800'
+        self.assertRaises(UnicodeEncodeError, realpath, path, strict=False)
+        self.assertRaises(UnicodeEncodeError, realpath, path, strict=True)
+        path = '/nonexistent/\ud800'
+        self.assertRaises(UnicodeEncodeError, realpath, path, strict=False)
+        self.assertRaises(FileNotFoundError, realpath, path, strict=True)
+
+    @unittest.skipUnless(sys.platform == 'win32', 'requires native Unicode paths')
+    def test_realpath_undecodable(self):
+        path = b'/\xff'
+        self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
+        self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
+        path = b'/nonexistent/\xff'
+        self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
+        self.assertRaises(FileNotFoundError, realpath, path, strict=True)
 
     @os_helper.skip_unless_symlink
     @skip_if_ABSTFN_contains_backslash

Lib/test/test_tarfile.py

@@ -4093,6 +4093,7 @@ def test_data_filter(self):
                 self.assertIs(filtered.name, tarinfo.name)
                 self.assertIs(filtered.type, tarinfo.type)
 
+    @unittest.skipIf(sys.platform == 'win32', 'requires native bytes paths')
     def test_filter_unencodable(self):
         # Sanity check using a valid path.
         tarinfo = tarfile.TarInfo(os_helper.TESTFN)
@@ -4101,14 +4102,17 @@ def test_filter_unencodable(self):
         filtered = tarfile.data_filter(tarinfo, '')
         self.assertIs(filtered.name, tarinfo.name)
 
-        tarinfo = tarfile.TarInfo('test\0')
+        tarinfo = tarfile.TarInfo('test\x00')
         self.assertRaises(ValueError, tarfile.tar_filter, tarinfo, '')
         self.assertRaises(ValueError, tarfile.data_filter, tarinfo, '')
         tarinfo = tarfile.TarInfo('\ud800')
         self.assertRaises(UnicodeEncodeError, tarfile.tar_filter, tarinfo, '')
         self.assertRaises(UnicodeEncodeError, tarfile.data_filter, tarinfo, '')
 
-    def test_extract_encode_error(self):
+    @unittest.skipIf(sys.platform == 'win32', 'requires native bytes paths')
+    def test_extract_unencodable(self):
+        # Create a member with name \xed\xa0\x80 which is UTF-8 encoded
+        # lone surrogate \ud800.
         with ArchiveMaker(encoding='ascii', errors='surrogateescape') as arc:
             arc.add('\udced\udca0\udc80')
         with os_helper.temp_cwd() as tmp: