[pypy-svn] r68672 - pypy/branch/warmspot-jitinfo/pypy/jit/metainterp/test

[arigo at codespeak.net]

Author: arigo
Date: Tue Oct 20 21:47:38 2009
New Revision: 68672

Modified:
   pypy/branch/warmspot-jitinfo/pypy/jit/metainterp/test/test_warmstate.py
Log:
Fix the test.


Modified: pypy/branch/warmspot-jitinfo/pypy/jit/metainterp/test/test_warmstate.py
==============================================================================
--- pypy/branch/warmspot-jitinfo/pypy/jit/metainterp/test/test_warmstate.py	(original)
+++ pypy/branch/warmspot-jitinfo/pypy/jit/metainterp/test/test_warmstate.py	Tue Oct 20 21:47:38 2009
@@ -7,6 +7,7 @@
 from pypy.jit.metainterp.warmstate import WarmEnterState
 from pypy.jit.metainterp.history import BoxInt, BoxFloat, BoxPtr
 from pypy.jit.metainterp.history import ConstInt, ConstFloat, ConstPtr
+from pypy.rlib.jit import BaseJitCell
 
 
 def test_unwrap():
@@ -59,7 +60,7 @@
 def test_make_jitcell_getter_default():
     class FakeWarmRunnerDesc:
         green_args_spec = [lltype.Signed, lltype.Float]
-    class FakeJitCell:
+    class FakeJitCell(BaseJitCell):
         pass
     state = WarmEnterState(FakeWarmRunnerDesc())
     get_jitcell = state._make_jitcell_getter_default(FakeJitCell)
@@ -83,8 +84,11 @@
     assert get_jitcell is state.make_jitcell_getter()
 
 def test_make_jitcell_getter_custom():
-    class FakeJitCell:
-        _TYPE = llmemory.GCREF
+    from pypy.rpython.typesystem import LowLevelTypeSystem
+    class FakeRTyper:
+        type_system = LowLevelTypeSystem.instance
+    class FakeJitCell(BaseJitCell):
+        pass
     celldict = {}
     def getter(x, y):
         return celldict.get((x, y))
@@ -97,7 +101,7 @@
     SETTER = lltype.Ptr(lltype.FuncType([llmemory.GCREF, lltype.Signed,
                                          lltype.Float], lltype.Void))
     class FakeWarmRunnerDesc:
-        rtyper = None
+        rtyper = FakeRTyper()
         cpu = None
         get_jitcell_at_ptr = llhelper(GETTER, getter)
         set_jitcell_at_ptr = llhelper(SETTER, setter)