[pypy-svn] r52071 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sun Mar  2 20:37:34 2008
New Revision: 52071

Modified:
   pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py
   pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py
Log:
fix yet another skipped test


Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py
==============================================================================
--- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py	(original)
+++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py	Sun Mar  2 20:37:34 2008
@@ -229,7 +229,8 @@
         if not self.on_llgraph:
             return
         oops = {}
-        for block in self.residual_graph.iterblocks():
+        residual_graph = self.get_residual_graph()
+        for block in residual_graph.iterblocks():
             for op in block.operations:
                 if op.opname == 'direct_call':
                     f = getattr(op.args[0].value._obj, "_callable", None)
@@ -240,9 +241,11 @@
             assert oops == expected
         for name, count in counts.items():
             assert oops.get(name, 0) == count
+
     def check_flexswitches(self, expected_count):
+        residual_graph = self.get_residual_graph()
         count = 0
-        for block in self.residual_graph.iterblocks():
+        for block in residual_graph.iterblocks():
             if (isinstance(block.exitswitch, Variable) and
                 block.exitswitch.concretetype is lltype.Signed):
                 count += 1

Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py
==============================================================================
--- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py	(original)
+++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py	Sun Mar  2 20:37:34 2008
@@ -1200,7 +1200,6 @@
         assert res == main()
 
     def test_simple_interpreter_with_frame_with_stack(self):
-        py.test.skip("strange problem")
         class Log:
             stack = None
         log = Log()