[pypy-commit] pypy numpy-record-dtypes: fix tests
fijal
noreply at buildbot.pypy.org
Thu Mar 15 20:37:52 CET 2012
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: numpy-record-dtypes
Changeset: r53705:265f26eb527b
Date: 2012-03-15 20:37 +0100
http://bitbucket.org/pypy/pypy/changeset/265f26eb527b/
Log: fix tests
diff --git a/pypy/module/micronumpy/test/test_base.py b/pypy/module/micronumpy/test/test_base.py
--- a/pypy/module/micronumpy/test/test_base.py
+++ b/pypy/module/micronumpy/test/test_base.py
@@ -4,6 +4,7 @@
from pypy.module.micronumpy.interp_ufuncs import (find_binop_result_dtype,
find_unaryop_result_dtype)
from pypy.module.micronumpy.interp_boxes import W_Float64Box
+from pypy.module.micronumpy.interp_dtype import nonnative_byteorder_prefix
from pypy.conftest import option
import sys
@@ -15,6 +16,7 @@
sys.modules['numpypy'] = numpy
sys.modules['_numpypy'] = numpy
cls.space = gettestobjspace(usemodules=['micronumpy'])
+ cls.w_non_native_prefix = cls.space.wrap(nonnative_byteorder_prefix)
class TestSignature(object):
def test_binop_signature(self, space):
diff --git a/pypy/module/micronumpy/test/test_dtypes.py b/pypy/module/micronumpy/test/test_dtypes.py
--- a/pypy/module/micronumpy/test/test_dtypes.py
+++ b/pypy/module/micronumpy/test/test_dtypes.py
@@ -1,7 +1,6 @@
import py
from pypy.conftest import option
from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
-from pypy.module.micronumpy.interp_dtype import nonnative_byteorder_prefix
from pypy.interpreter.gateway import interp2app
class AppTestDtypes(BaseNumpyAppTest):
@@ -187,21 +186,7 @@
assert dtype("float") is dtype(float)
-class AppTestTypes(BaseNumpyAppTest):
- def setup_class(cls):
- BaseNumpyAppTest.setup_class.im_func(cls)
- cls.w_non_native_prefix = cls.space.wrap(nonnative_byteorder_prefix)
- def check_non_native(w_obj, w_obj2):
- assert w_obj.storage[0] == w_obj2.storage[1]
- assert w_obj.storage[1] == w_obj2.storage[0]
- if w_obj.storage[0] == '\x00':
- assert w_obj2.storage[1] == '\x00'
- assert w_obj2.storage[0] == '\x01'
- else:
- assert w_obj2.storage[1] == '\x01'
- assert w_obj2.storage[0] == '\x00'
- cls.w_check_non_native = cls.space.wrap(interp2app(check_non_native))
-
+class AppTestTypes(BaseNumpyAppTest):
def test_abstract_types(self):
import _numpypy as numpy
raises(TypeError, numpy.generic, 0)
@@ -554,6 +539,16 @@
class AppTestNotDirect(BaseNumpyAppTest):
def setup_class(cls):
BaseNumpyAppTest.setup_class.im_func(cls)
+ def check_non_native(w_obj, w_obj2):
+ assert w_obj.storage[0] == w_obj2.storage[1]
+ assert w_obj.storage[1] == w_obj2.storage[0]
+ if w_obj.storage[0] == '\x00':
+ assert w_obj2.storage[1] == '\x00'
+ assert w_obj2.storage[0] == '\x01'
+ else:
+ assert w_obj2.storage[1] == '\x01'
+ assert w_obj2.storage[0] == '\x00'
+ cls.w_check_non_native = cls.space.wrap(interp2app(check_non_native))
if option.runappdirect:
py.test.skip("not a direct test")
More information about the pypy-commit
mailing list