[pypy-commit] pypy py3k: Skip some implementation details

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r58863:41415f4bf59d
Date: 2012-11-12 21:18 +0100
http://bitbucket.org/pypy/pypy/changeset/41415f4bf59d/

Log:	Skip some implementation details

diff --git a/lib-python/3.2/test/test_scope.py b/lib-python/3.2/test/test_scope.py
--- a/lib-python/3.2/test/test_scope.py
+++ b/lib-python/3.2/test/test_scope.py
@@ -1,5 +1,5 @@
 import unittest
-from test.support import check_syntax_error, run_unittest
+from test.support import check_syntax_error, run_unittest, gc_collect
 
 
 class ScopeTests(unittest.TestCase):
@@ -419,6 +419,7 @@
 
         for i in range(100):
             f1()
+        gc_collect()
 
         self.assertEqual(Foo.count, 0)
 
diff --git a/lib-python/3.2/test/test_sort.py b/lib-python/3.2/test/test_sort.py
--- a/lib-python/3.2/test/test_sort.py
+++ b/lib-python/3.2/test/test_sort.py
@@ -147,10 +147,15 @@
                 return random.random() < 0.5
 
         L = [C() for i in range(50)]
-        self.assertRaises(ValueError, L.sort)
+        try:
+            L.sort()
+        except ValueError:
+            pass
 
+    @support.impl_detail(pypy=False)
     def test_undetected_mutation(self):
         # Python 2.4a1 did not always detect mutation
+        # So does pypy...
         memorywaster = []
         for i in range(20):
             def mutating_cmp(x, y):
@@ -216,7 +221,10 @@
                 data[:] = range(20)
             def __lt__(self, other):
                 return id(self) < id(other)
-        self.assertRaises(ValueError, data.sort, key=SortKiller)
+        try:
+            data.sort(key=SortKiller)
+        except ValueError:
+            pass
 
     def test_key_with_mutating_del_and_exception(self):
         data = list(range(10))