[pypy-svn] r69960 - pypy/branch/virtual-forcing/pypy/interpreter/test

[arigo at codespeak.net]

Author: arigo
Date: Mon Dec  7 23:36:22 2009
New Revision: 69960

Modified:
   pypy/branch/virtual-forcing/pypy/interpreter/test/test_zzpickle_and_slow.py
Log:
Fix this test too.


Modified: pypy/branch/virtual-forcing/pypy/interpreter/test/test_zzpickle_and_slow.py
==============================================================================
--- pypy/branch/virtual-forcing/pypy/interpreter/test/test_zzpickle_and_slow.py	(original)
+++ pypy/branch/virtual-forcing/pypy/interpreter/test/test_zzpickle_and_slow.py	Mon Dec  7 23:36:22 2009
@@ -2,6 +2,7 @@
 from pypy import conftest
 from pypy.conftest import gettestobjspace
 from pypy.interpreter import gateway
+from pypy.rlib.jit import non_virtual_ref, vref_None
 
 class AppTestSlow:    
     def setup_class(cls):
@@ -30,21 +31,18 @@
     from pypy.interpreter import pytraceback
     def hide_top_frame(space, w_frame):
         w_last = None
-        while w_frame.f_back():
-            # should have been forced by traceback capturing
-            assert w_frame.f_back_forced
+        while w_frame.f_backref():
             w_last = w_frame
-            w_frame = w_frame.f_back()
+            w_frame = w_frame.f_backref()
         assert w_last
-        w_saved = w_last.f_back()
-        w_last.f_back_some = None
+        w_saved = w_last.f_backref()
+        w_last.f_backref = vref_None
         return w_saved
 
     def restore_top_frame(space, w_frame, w_saved):
-        while w_frame.f_back():
-            assert w_frame.f_back_forced
-            w_frame = w_frame.f_back()
-        w_frame.f_back_some = w_saved
+        while w_frame.f_backref():
+            w_frame = w_frame.f_backref()
+        w_frame.f_backref = non_virtual_ref(w_saved)
 
     def read_exc_type(space, w_frame):
         if w_frame.last_exception is None: