[pypy-commit] pypy gc-minimark-pinning: fix the tests (which still does not pass)

[fijal]

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

Log:	fix the tests (which still does not pass)

diff --git a/pypy/rpython/memory/test/test_gc.py b/pypy/rpython/memory/test/test_gc.py
--- a/pypy/rpython/memory/test/test_gc.py
+++ b/pypy/rpython/memory/test/test_gc.py
@@ -722,19 +722,17 @@
             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))
+            rgc.unpin(s)
             return sum
 
         res = self.interpret(f, [10])
         if not self.GCClass.moving_gc:
             assert res == 13
         elif self.GCClass.can_always_pin_objects:
-            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
 
 from pypy.rlib.objectmodel import UnboxedValue