diff options
Diffstat (limited to 'Lib/test/test_posixpath.py')
| -rw-r--r-- | Lib/test/test_posixpath.py | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py index 54de0cf..89c4f9e 100644 --- a/Lib/test/test_posixpath.py +++ b/Lib/test/test_posixpath.py @@ -1,6 +1,7 @@ import unittest from test import support, test_genericpath +import itertools import posixpath import os import sys @@ -56,15 +57,21 @@ class PosixPathTest(unittest.TestCase): self.assertEqual(posixpath.join(b"/foo/", b"bar/", b"baz/"), b"/foo/bar/baz/") - with self.assertRaises(TypeError) as e: - posixpath.join(b'bytes', 'str') - self.assertIn("Can't mix strings and bytes", e.args[0]) - with self.assertRaises(TypeError) as e: - posixpath.join('str', b'bytes') - self.assertIn("Can't mix strings and bytes", e.args[0]) - with self.assertRaises(TypeError) as e: - posixpath.join('str', bytearray(b'bytes')) - self.assertIn("Can't mix strings and bytes", e.args[0]) + def check_error_msg(list_of_args, msg): + """Check posixpath.join raises friendly TypeErrors.""" + for args in (item for perm in list_of_args + for item in itertools.permutations(perm)): + with self.assertRaises(TypeError) as cm: + posixpath.join(*args) + self.assertEqual(msg, cm.exception.args[0]) + + check_error_msg([[b'bytes', 'str'], [bytearray(b'bytes'), 'str']], + "Can't mix strings and bytes in path components.") + # regression, see #15377 + with self.assertRaises(TypeError) as cm: + os.path.join(None, 'str') + self.assertNotEqual("Can't mix strings and bytes in path components.", + cm.exception.args[0]) def test_split(self): self.assertEqual(posixpath.split("/foo/bar"), ("/foo", "bar")) |