Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r60100:d76c4740cba4
Date: 2013-01-15 21:01 +0100
http://bitbucket.org/pypy/pypy/changeset/d76c4740cba4/
Log: Fixed more tests
diff --git a/rpython/jit/backend/x86/test/test_zmath.py
b/rpython/jit/backend/x86/test/test_zmath.py
--- a/rpython/jit/backend/x86/test/test_zmath.py
+++ b/rpython/jit/backend/x86/test/test_zmath.py
@@ -8,7 +8,7 @@
from rpython.rlib.unroll import unrolling_iterable
from rpython.rlib.debug import debug_print
from rpython.rtyper.lltypesystem.module.test.test_ll_math import (MathTests,
- getTester)
+ get_tester)
def get_test_case((fnname, args, expected)):
try:
diff --git a/rpython/jit/codewriter/test/test_jtransform.py
b/rpython/jit/codewriter/test/test_jtransform.py
--- a/rpython/jit/codewriter/test/test_jtransform.py
+++ b/rpython/jit/codewriter/test/test_jtransform.py
@@ -1249,7 +1249,7 @@
op = SpaceOperation('getfield', [v_x, Constant('x', lltype.Void)],
varoftype(lltype.Signed))
tr = Transformer(None, None)
- raises(NotImplementedError, tr.rewrite_operation, op)
+ py.test.raises(NotImplementedError, tr.rewrite_operation, op)
def test_cast_opaque_ptr():
S = lltype.GcStruct("S", ("x", lltype.Signed))
diff --git a/rpython/rtyper/lltypesystem/test/test_ll2ctypes.py
b/rpython/rtyper/lltypesystem/test/test_ll2ctypes.py
--- a/rpython/rtyper/lltypesystem/test/test_ll2ctypes.py
+++ b/rpython/rtyper/lltypesystem/test/test_ll2ctypes.py
@@ -1017,6 +1017,7 @@
assert ftest == [-5, -5, -5]
def test_c_callback_with_void_arg_3(self):
+ from rpython.rtyper.lltypesystem.rstr import LLHelpers
def f(i):
x = 'X' * i
return x[-2]
@@ -1028,8 +1029,8 @@
graph = a.translator.graphs[0]
op = graph.startblock.operations[-1]
assert op.opname == 'direct_call'
- assert op.args[0].value._obj._callable ==
rpython.rtyper.lltypesystem.rstr.LLHelpers.ll_stritem.im_func
- assert op.args[1].value == rpython.rtyper.lltypesystem.rstr.LLHelpers
+ assert op.args[0].value._obj._callable == LLHelpers.ll_stritem.im_func
+ assert op.args[1].value == LLHelpers
assert op.args[3].value == -2
def test_recursive_struct_more(self):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
