[pypy-svn] r77156 - pypy/trunk/pypy/rlib/test

[agaynor at codespeak.net]

Author: agaynor
Date: Fri Sep 17 17:00:27 2010
New Revision: 77156

Modified:
   pypy/trunk/pypy/rlib/test/test_rgc.py
Log:
Fix 2 GC test failures.

Modified: pypy/trunk/pypy/rlib/test/test_rgc.py
==============================================================================
--- pypy/trunk/pypy/rlib/test/test_rgc.py	(original)
+++ pypy/trunk/pypy/rlib/test/test_rgc.py	Fri Sep 17 17:00:27 2010
@@ -16,7 +16,7 @@
     assert len(op.args) == 0
 
     res = interpret(f, [])
-    
+
     assert res is None
 
 def test_collect_0():
@@ -31,13 +31,13 @@
     assert len(ops) == 1
     op = ops[0][1]
     assert op.opname == 'gc__collect'
-    assert len(op.args) == 1    
+    assert len(op.args) == 1
     assert op.args[0].value == 0
 
     res = interpret(f, [])
-    
-    assert res is None    
-    
+
+    assert res is None
+
 def test_can_move():
     T0 = lltype.GcStruct('T')
     T1 = lltype.GcArray(lltype.Float)
@@ -53,9 +53,9 @@
     assert len(res) == 2
 
     res = interpret(f, [1])
-    
+
     assert res == True
-    
+
 def test_ll_arraycopy_1():
     TYPE = lltype.GcArray(lltype.Signed)
     a1 = lltype.malloc(TYPE, 10)
@@ -168,7 +168,7 @@
     x1 = X()
     x1.stuff = X()
     x2 = X()
-    lst = rgc._get_referents(rgc.cast_instance_to_gcref(x1))
+    lst = rgc.get_rpy_referents(rgc.cast_instance_to_gcref(x1))
     lst2 = [rgc.try_cast_gcref_to_instance(X, x) for x in lst]
     assert x1.stuff in lst2
     assert x2 not in lst2
@@ -177,5 +177,5 @@
     class X(object):
         pass
     x1 = X()
-    n = rgc._get_memory_usage(rgc.cast_instance_to_gcref(x1))
+    n = rgc.get_rpy_memory_usage(rgc.cast_instance_to_gcref(x1))
     assert n >= 8 and n <= 64