summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2012-07-17 08:48:19 (GMT)
committerHynek Schlawack <hs@ox.cx>2012-07-17 08:48:19 (GMT)
commit7cdc2bdd0d13982256fb28f49696fa70baab7ed0 (patch)
tree6360fdc5f00214ddca996a791f23117d3cb4a003
parent954d46b2ccf2c5800b89bd6c8616cafeb39168d6 (diff)
downloadcpython-7cdc2bdd0d13982256fb28f49696fa70baab7ed0.zip
cpython-7cdc2bdd0d13982256fb28f49696fa70baab7ed0.tar.gz
cpython-7cdc2bdd0d13982256fb28f49696fa70baab7ed0.tar.bz2
Fix context manager use in posixpath.join() tests
The asserts were useless (and buggy).
-rw-r--r--Lib/test/test_posixpath.py21
1 files changed, 12 insertions, 9 deletions
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 54de0cf..1ec4a15 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -56,15 +56,18 @@ 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])
+ # Check for friendly str/bytes mixing message
+ for args in [[b'bytes', 'str'],
+ [bytearray(b'bytes'), 'str']]:
+ for _ in range(2):
+ with self.assertRaises(TypeError) as cm:
+ posixpath.join(*args)
+ self.assertEqual(
+ "Can't mix strings and bytes in path components.",
+ cm.exception.args[0]
+ )
+ args.reverse() # check both orders
+
def test_split(self):
self.assertEqual(posixpath.split("/foo/bar"), ("/foo", "bar"))