From: Hynek Schlawack <hs@ox.cx>
Date: Tue, 17 Jul 2012 08:48:19 +0000 (+0200)
Subject: Fix context manager use in posixpath.join() tests
X-Git-Tag: v3.3.0b2~179^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7cdc2bdd0d13982256fb28f49696fa70baab7ed0;p=thirdparty%2FPython%2Fcpython.git

Fix context manager use in posixpath.join() tests

The asserts were useless (and buggy).
---

diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 54de0cf51635..1ec4a154d997 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"))