Handle more possible Exceptions explicitly.

Author: note35

Lib/test/test_posixpath.py

@@ -506,13 +506,13 @@ def test_realpath_invalid_paths(self):
         self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
         path = '/nonexistent/x\x00'
         self.assertRaises(ValueError, realpath, path, strict=False)
-        self.assertRaises(FileNotFoundError, realpath, path, strict=ALL_BUT_LAST)
-        self.assertRaises(FileNotFoundError, realpath, path, strict=True)
+        self.assertRaises((FileNotFoundError, ValueError), realpath, path, strict=ALL_BUT_LAST)
+        self.assertRaises((FileNotFoundError, ValueError), realpath, path, strict=True)
         self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
         path = b'/nonexistent/x\x00'
         self.assertRaises(ValueError, realpath, path, strict=False)
-        self.assertRaises(FileNotFoundError, realpath, path, strict=ALL_BUT_LAST)
-        self.assertRaises(FileNotFoundError, realpath, path, strict=True)
+        self.assertRaises((FileNotFoundError, ValueError), realpath, path, strict=ALL_BUT_LAST)
+        self.assertRaises((FileNotFoundError, ValueError), realpath, path, strict=True)
         self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
         path = '/\x00/..'
         self.assertRaises(ValueError, realpath, path, strict=False)
@@ -527,13 +527,13 @@ def test_realpath_invalid_paths(self):
 
         path = '/nonexistent/x\x00/..'
         self.assertRaises(ValueError, realpath, path, strict=False)
-        self.assertRaises(FileNotFoundError, realpath, path, strict=ALL_BUT_LAST)
-        self.assertRaises(FileNotFoundError, realpath, path, strict=True)
+        self.assertRaises((FileNotFoundError, ValueError), realpath, path, strict=ALL_BUT_LAST)
+        self.assertRaises((FileNotFoundError, ValueError), realpath, path, strict=True)
         self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
         path = b'/nonexistent/x\x00/..'
         self.assertRaises(ValueError, realpath, path, strict=False)
-        self.assertRaises(FileNotFoundError, realpath, path, strict=ALL_BUT_LAST)
-        self.assertRaises(FileNotFoundError, realpath, path, strict=True)
+        self.assertRaises((FileNotFoundError, ValueError), realpath, path, strict=ALL_BUT_LAST)
+        self.assertRaises((FileNotFoundError, ValueError), realpath, path, strict=True)
         self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
 
         path = '/\udfff'
@@ -553,8 +553,8 @@ def test_realpath_invalid_paths(self):
         else:
             self.assertRaises(UnicodeEncodeError, realpath, path, strict=False)
             self.assertRaises(UnicodeEncodeError, realpath, path, strict=ALLOW_MISSING)
-        self.assertRaises(FileNotFoundError, realpath, path, strict=ALL_BUT_LAST)
-        self.assertRaises(FileNotFoundError, realpath, path, strict=True)
+        self.assertRaises((FileNotFoundError, ValueError), realpath, path, strict=ALL_BUT_LAST)
+        self.assertRaises((FileNotFoundError, ValueError), realpath, path, strict=True)
         path = '/\udfff/..'
         if sys.platform == 'win32':
             self.assertEqual(realpath(path, strict=False), '/')
@@ -572,8 +572,8 @@ def test_realpath_invalid_paths(self):
         else:
             self.assertRaises(UnicodeEncodeError, realpath, path, strict=False)
             self.assertRaises(UnicodeEncodeError, realpath, path, strict=ALLOW_MISSING)
-        self.assertRaises(FileNotFoundError, realpath, path, strict=ALL_BUT_LAST)
-        self.assertRaises(FileNotFoundError, realpath, path, strict=True)
+        self.assertRaises((FileNotFoundError, ValueError), realpath, path, strict=ALL_BUT_LAST)
+        self.assertRaises((FileNotFoundError, ValueError), realpath, path, strict=True)
 
         path = b'/\xff'
         if sys.platform == 'win32':