summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_posixpath.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-08-24 09:23:36 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-08-24 09:23:36 (GMT)
commit1fa36268cfdac3760de37859aa3ec1b5121248c5 (patch)
tree98f22fd456dcbba258133cd82404352d647985b2 /Lib/test/test_posixpath.py
parent66106626edb739f7d5dd3d0a7a2dd634a0e5a0b8 (diff)
parent549c1972f2b063e3d36ffff6c917372db512e7d4 (diff)
downloadcpython-1fa36268cfdac3760de37859aa3ec1b5121248c5.zip
cpython-1fa36268cfdac3760de37859aa3ec1b5121248c5.tar.gz
cpython-1fa36268cfdac3760de37859aa3ec1b5121248c5.tar.bz2
Issue #22034: Improve handling of wrong argument types in posixpath.join().
Diffstat (limited to 'Lib/test/test_posixpath.py')
-rw-r--r--Lib/test/test_posixpath.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 412849c..d5a12a3 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -57,21 +57,21 @@ class PosixPathTest(unittest.TestCase):
self.assertEqual(posixpath.join(b"/foo/", b"bar/", b"baz/"),
b"/foo/bar/baz/")
- 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.")
+ def test_join_errors(self):
+ # Check posixpath.join raises friendly TypeErrors.
+ errmsg = "Can't mix strings and bytes in path components"
+ with self.assertRaisesRegex(TypeError, errmsg):
+ posixpath.join(b'bytes', 'str')
+ with self.assertRaisesRegex(TypeError, errmsg):
+ posixpath.join('str', b'bytes')
# regression, see #15377
- with self.assertRaises(TypeError) as cm:
+ errmsg = r'join\(\) argument must be str or bytes, not %r'
+ with self.assertRaisesRegex(TypeError, errmsg % 'NoneType'):
posixpath.join(None, 'str')
- self.assertNotEqual("Can't mix strings and bytes in path components.",
- cm.exception.args[0])
+ with self.assertRaisesRegex(TypeError, errmsg % 'NoneType'):
+ posixpath.join('str', None)
+ with self.assertRaisesRegex(TypeError, errmsg % 'bytearray'):
+ posixpath.join(bytearray(b'foo'), bytearray(b'bar'))
def test_split(self):
self.assertEqual(posixpath.split("/foo/bar"), ("/foo", "bar"))