[pypy-commit] pypy gc-minimark-pinning: fix more tests

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: gc-minimark-pinning
Changeset: r55045:a9772bc4012c
Date: 2012-05-11 18:17 +0200
http://bitbucket.org/pypy/pypy/changeset/a9772bc4012c/

Log:	fix more tests

diff --git a/pypy/rpython/memory/test/test_transformed_gc.py b/pypy/rpython/memory/test/test_transformed_gc.py
--- a/pypy/rpython/memory/test/test_transformed_gc.py
+++ b/pypy/rpython/memory/test/test_transformed_gc.py
@@ -691,10 +691,7 @@
             s = str(i)
             if not rgc.can_move(s):
                 return 13
-            sum = 0
-            with rgc.pinned_object(s):
-                sum += int(rgc.can_move(s))
-            sum += 10 * int(rgc.can_move(s))
+            sum = int(rgc.pin(s))
             return sum
         return f
 
@@ -703,9 +700,9 @@
         if not self.GC_CAN_MOVE:
             assert res == 13
         elif self.GC_CAN_ALWAYS_PIN:
-            assert res == 10
+            assert res == 1
         else:
-            assert res == 11 or res == 13 # sometimes fresh objs can't move
+            assert res == 0 or res == 13 # sometimes fresh objs can't move
 
 
 class GenericMovingGCTests(GenericGCTests):