[pypy-commit] pypy split-rpython: Fixed tests

[Aquana]

Author: Alexander Hesse <webmaster at aquanasoft.de>
Branch: split-rpython
Changeset: r60094:ed119bf74a79
Date: 2013-01-15 19:18 +0100
http://bitbucket.org/pypy/pypy/changeset/ed119bf74a79/

Log:	Fixed tests

diff --git a/rpython/rlib/test/test_jit.py b/rpython/rlib/test/test_jit.py
--- a/rpython/rlib/test/test_jit.py
+++ b/rpython/rlib/test/test_jit.py
@@ -222,7 +222,7 @@
         myjitdriver = JitDriver(greens=['r1', 'i1', 'f1'], reds=[])
         class A(object):
             pass
-        e = raises(AssertionError,
+        e = py.test.raises(AssertionError,
                    myjitdriver.jit_merge_point, i1=42, r1=A(), f1=3.5)
 
     def test_argument_order_more_precision_later(self):
@@ -230,7 +230,7 @@
         class A(object):
             pass
         myjitdriver.jit_merge_point(i1=42, r1=None, r2=None, f1=3.5)
-        e = raises(AssertionError,
+        e = py.test.raises(AssertionError,
                    myjitdriver.jit_merge_point, i1=42, r1=A(), r2=None, f1=3.5)
         assert "got ['2:REF', '1:INT', '?', '3:FLOAT']" in repr(e.value)
 
@@ -239,7 +239,7 @@
         class A(object):
             pass
         myjitdriver.jit_merge_point(i1=42, r1=None, r2=A(), f1=3.5)
-        e = raises(AssertionError,
+        e = py.test.raises(AssertionError,
                    myjitdriver.jit_merge_point, i1=42, r1=A(), r2=None, f1=3.5)
         assert "got ['2:REF', '1:INT', '2:REF', '3:FLOAT']" in repr(e.value)
 
diff --git a/rpython/rlib/test/test_libffi.py b/rpython/rlib/test/test_libffi.py
--- a/rpython/rlib/test/test_libffi.py
+++ b/rpython/rlib/test/test_libffi.py
@@ -178,7 +178,7 @@
 
     def test_windll(self):
         if os.name != 'nt':
-            skip('Run only on windows')
+            py.test.skip('Run only on windows')
         from rpython.rlib.libffi import WinDLL
         dll = WinDLL('Kernel32.dll')
         sleep = dll.getpointer('Sleep',[types.uint], types.void)
diff --git a/rpython/rlib/test/test_rarithmetic.py b/rpython/rlib/test/test_rarithmetic.py
--- a/rpython/rlib/test/test_rarithmetic.py
+++ b/rpython/rlib/test/test_rarithmetic.py
@@ -216,7 +216,7 @@
     n = -sys.maxint-1
     y = sys.maxint-1
     # sanity
-    raises(AssertionError, ovfcheck, r_uint(0))
+    py.test.raises(AssertionError, ovfcheck, r_uint(0))
 
     # not overflowing
     try:
diff --git a/rpython/rlib/test/test_rbigint.py b/rpython/rlib/test/test_rbigint.py
--- a/rpython/rlib/test/test_rbigint.py
+++ b/rpython/rlib/test/test_rbigint.py
@@ -249,7 +249,7 @@
         assert d == float(x)
         x = x ** 100
         f1 = rbigint.fromlong(x)
-        assert raises(OverflowError, f1.tofloat)
+        assert py.test.raises(OverflowError, f1.tofloat)
         f2 = rbigint.fromlong(2097152 << SHIFT)
         d = f2.tofloat()
         assert d == float(2097152 << SHIFT)
@@ -282,8 +282,8 @@
         # XXX don't use such consts. marshal doesn't handle them right.
         x = 12345.6789e200
         x *= x
-        assert raises(OverflowError, rbigint.fromfloat, x)
-        assert raises(ValueError, rbigint.fromfloat, NAN)
+        assert py.test.raises(OverflowError, rbigint.fromfloat, x)
+        assert py.test.raises(ValueError, rbigint.fromfloat, NAN)
         #
         f1 = rbigint.fromfloat(9007199254740991.0)
         assert f1.tolong() == 9007199254740991
@@ -781,13 +781,13 @@
         s = "\xFF\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\xFF"
         bigint = rbigint.frombytes(s, byteorder="big", signed=False)
         assert s == bigint.tobytes(16, byteorder="big", signed=False)
-        raises(InvalidEndiannessError, bigint.frombytes, '\xFF', 'foo',
+        py.test.raises(InvalidEndiannessError, bigint.frombytes, '\xFF', 'foo',
                signed=True)
 
     def test_tobytes(self):
         assert rbigint.fromint(0).tobytes(1, 'big', signed=True) == '\x00'
         assert rbigint.fromint(1).tobytes(2, 'big', signed=True) == '\x00\x01'
-        raises(OverflowError, rbigint.fromint(255).tobytes, 1, 'big', signed=True)
+        py.test.raises(OverflowError, rbigint.fromint(255).tobytes, 1, 'big', signed=True)
         assert rbigint.fromint(-129).tobytes(2, 'big', signed=True) == '\xff\x7f'
         assert rbigint.fromint(-129).tobytes(2, 'little', signed=True) == '\x7f\xff'
         assert rbigint.fromint(65535).tobytes(3, 'big', signed=True) == '\x00\xff\xff'
@@ -795,7 +795,7 @@
         assert rbigint.fromint(65535).tobytes(2, 'big', signed=False) == '\xff\xff'
         assert rbigint.fromint(-8388608).tobytes(3, 'little', signed=True) == '\x00\x00\x80'
         i = rbigint.fromint(-8388608)
-        raises(InvalidEndiannessError, i.tobytes, 3, 'foo', signed=True)
-        raises(InvalidSignednessError, i.tobytes, 3, 'little', signed=False)
-        raises(OverflowError, i.tobytes, 2, 'little', signed=True)
+        py.test.raises(InvalidEndiannessError, i.tobytes, 3, 'foo', signed=True)
+        py.test.raises(InvalidSignednessError, i.tobytes, 3, 'little', signed=False)
+        py.test.raises(OverflowError, i.tobytes, 2, 'little', signed=True)