[Python-checkins] cpython (3.2): Fix context manager use in posixpath.join() tests

[hynek.schlawack]

http://hg.python.org/cpython/rev/eddafae5e575
changeset:   78146:eddafae5e575
branch:      3.2
parent:      78142:71537aba3a0a
user:        Hynek Schlawack <hs at ox.cx>
date:        Tue Jul 17 10:48:19 2012 +0200
summary:
  Fix context manager use in posixpath.join() tests

The asserts were useless (and buggy).

files:
  Lib/test/test_posixpath.py |  21 ++++++++++++---------
  1 files changed, 12 insertions(+), 9 deletions(-)


diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -56,15 +56,18 @@
         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"))

-- 
Repository URL: http://hg.python.org/cpython