[pypy-svn] r69299 - pypy/branch/faster-raise/lib-python/modified-2.5.2/test

[fijal at codespeak.net]

Author: fijal
Date: Sun Nov 15 11:36:15 2009
New Revision: 69299

Modified:
   pypy/branch/faster-raise/lib-python/modified-2.5.2/test/test_codeccallbacks.py
Log:
We don't really care if creation or replacing causes TypeErrors


Modified: pypy/branch/faster-raise/lib-python/modified-2.5.2/test/test_codeccallbacks.py
==============================================================================
--- pypy/branch/faster-raise/lib-python/modified-2.5.2/test/test_codeccallbacks.py	(original)
+++ pypy/branch/faster-raise/lib-python/modified-2.5.2/test/test_codeccallbacks.py	Sun Nov 15 11:36:15 2009
@@ -447,6 +447,14 @@
             (u"", 1)
         )
 
+    def check_double_raise(self, tp, func, arg):
+        try:
+            arg()
+        except tp:
+            pass
+        else:
+            self.assertRaises(tp, func, arg)
+
     def test_badandgoodreplaceexceptions(self):
         # "replace" complains about a non-exception passed in
         self.assertRaises(
@@ -460,15 +468,15 @@
            codecs.replace_errors,
            UnicodeError("ouch")
         )
-        self.assertRaises(
+        self.check_double_raise(
             TypeError,
             codecs.replace_errors,
-            BadObjectUnicodeEncodeError()
+            BadObjectUnicodeEncodeError,
         )
-        self.assertRaises(
+        self.check_double_raise(
             TypeError,
             codecs.replace_errors,
-            BadObjectUnicodeDecodeError()
+            BadObjectUnicodeDecodeError,
         )
         # With the correct exception, "replace" returns an "?" or u"\ufffd" replacement
         self.assertEquals(