[pypy-commit] pypy merge-2.7.2: Skip check on the error message: pypy's multimethods are quite different

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: merge-2.7.2
Changeset: r51949:dc65c138fd25
Date: 2012-01-29 13:22 +0100
http://bitbucket.org/pypy/pypy/changeset/dc65c138fd25/

Log:	Skip check on the error message: pypy's multimethods are quite
	different

diff --git a/lib-python/modified-2.7/test/test_str.py b/lib-python/modified-2.7/test/test_str.py
--- a/lib-python/modified-2.7/test/test_str.py
+++ b/lib-python/modified-2.7/test/test_str.py
@@ -422,10 +422,11 @@
         for meth in ('foo'.startswith, 'foo'.endswith):
             with self.assertRaises(TypeError) as cm:
                 meth(['f'])
-            exc = str(cm.exception)
-            self.assertIn('unicode', exc)
-            self.assertIn('str', exc)
-            self.assertIn('tuple', exc)
+            if test_support.check_impl_detail():
+                exc = str(cm.exception)
+                self.assertIn('unicode', exc)
+                self.assertIn('str', exc)
+                self.assertIn('tuple', exc)
 
 def test_main():
     test_support.run_unittest(StrTest)
diff --git a/lib-python/modified-2.7/test/test_unicode.py b/lib-python/modified-2.7/test/test_unicode.py
--- a/lib-python/modified-2.7/test/test_unicode.py
+++ b/lib-python/modified-2.7/test/test_unicode.py
@@ -448,10 +448,11 @@
                 meth('\xff')
             with self.assertRaises(TypeError) as cm:
                 meth(['f'])
-            exc = str(cm.exception)
-            self.assertIn('unicode', exc)
-            self.assertIn('str', exc)
-            self.assertIn('tuple', exc)
+            if test_support.check_impl_detail():
+                exc = str(cm.exception)
+                self.assertIn('unicode', exc)
+                self.assertIn('str', exc)
+                self.assertIn('tuple', exc)
 
     @test_support.run_with_locale('LC_ALL', 'de_DE', 'fr_FR')
     def test_format_float(self):