[pypy-commit] pypy default: fix some tests

[fijal]

Author: fijal
Branch: 
Changeset: r82415:945e4b0a50d5
Date: 2016-02-23 10:02 +0100
http://bitbucket.org/pypy/pypy/changeset/945e4b0a50d5/

Log:	fix some tests

diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -28,7 +28,7 @@
     # setup rd data
     fi0 = resume.FrameInfo(None, FakeJitCode(), 11)
     snapshot0 = resume.Snapshot(None, [b0])
-    op.rd_snapshot = resume.Snapshot(snapshot0, [b1])
+    op.rd_snapshot = resume.TopSnapshot(snapshot0, [], [b1])
     op.rd_frame_info_list = resume.FrameInfo(fi0, FakeJitCode(), 33)
     #
     opt.store_final_boxes_in_guard(op, [])
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_util.py b/rpython/jit/metainterp/optimizeopt/test/test_util.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_util.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_util.py
@@ -506,7 +506,8 @@
             index = 0
 
         if op.is_guard():
-            op.rd_snapshot = resume.Snapshot(None, op.getfailargs())
+            op.rd_snapshot = resume.TopSnapshot(
+                resume.Snapshot(None, op.getfailargs()), [], [])
             op.rd_frame_info_list = resume.FrameInfo(None, FakeJitCode(), 11)
 
     def add_guard_future_condition(self, res):
diff --git a/rpython/jit/metainterp/optimizeopt/util.py b/rpython/jit/metainterp/optimizeopt/util.py
--- a/rpython/jit/metainterp/optimizeopt/util.py
+++ b/rpython/jit/metainterp/optimizeopt/util.py
@@ -8,7 +8,7 @@
 from rpython.jit.metainterp import resoperation
 from rpython.rlib.debug import make_sure_not_resized
 from rpython.jit.metainterp.resoperation import rop
-from rpython.jit.metainterp.resume import Snapshot, AccumInfo
+from rpython.jit.metainterp.resume import AccumInfo
 
 # ____________________________________________________________
 # Misc. utilities