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

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Feb  4 22:38:28 2008
New Revision: 51274

Modified:
   pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py
Log:
passes


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	Mon Feb  4 22:38:28 2008
@@ -622,7 +622,6 @@
         assert res == 4 * 4
 
     def test_degenerated_at_return(self):
-        py.test.skip("arrays and structs are not working")
         S = lltype.GcStruct('S', ('n', lltype.Signed))
         T = lltype.GcStruct('T', ('s', S), ('n', lltype.Float))
         class Result:
@@ -643,15 +642,9 @@
         ll_function.convert_result = glob_result.convert
 
         res = self.interpret(ll_function, [0], [])
-        assert res == "4"
-        if self.__class__ in (TestLLType, TestOOType):
-            assert lltype.parentlink(glob_result.s._obj) == (None, None)
+        assert res.n == 4
         res = self.interpret(ll_function, [1], [])
-        assert res == "3"
-        if self.__class__ in (TestLLType, TestOOType):
-            parent, parentindex = lltype.parentlink(glob_result.s._obj)
-            assert parentindex == 's'
-            assert parent.n == 3.25
+        assert res.n == 3
 
     def test_degenerated_via_substructure(self):
         S = lltype.GcStruct('S', ('n', lltype.Signed))