[pypy-commit] pypy remove-numpypy: change test_lib_pypy/numpypy to run against numpy

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: remove-numpypy
Changeset: r67724:cd4f6cf1f96e
Date: 2013-10-29 22:15 -0400
http://bitbucket.org/pypy/pypy/changeset/cd4f6cf1f96e/

Log:	change test_lib_pypy/numpypy to run against numpy

diff --git a/pypy/module/test_lib_pypy/numpypy/__init__.py b/pypy/module/test_lib_pypy/numpypy/__init__.py
new file mode 100644
diff --git a/pypy/module/test_lib_pypy/numpypy/core/test_fromnumeric.py b/pypy/module/test_lib_pypy/numpypy/core/test_fromnumeric.py
--- a/pypy/module/test_lib_pypy/numpypy/core/test_fromnumeric.py
+++ b/pypy/module/test_lib_pypy/numpypy/core/test_fromnumeric.py
@@ -1,4 +1,4 @@
-from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
+from pypy.module.test_lib_pypy.numpypy.test_base import BaseNumpyAppTest
 
 
 class AppTestFromNumeric(BaseNumpyAppTest):
@@ -187,7 +187,9 @@
         x = arange(4).reshape((2,2))
         assert (transpose(x) == array([[0, 2],[1, 3]])).all()
         # Once axes argument is implemented, add more tests
-        raises(NotImplementedError, "transpose(x, axes=(1, 0, 2))")
+        import sys
+        if '__pypy__' in sys.builtin_module_names:
+            raises(NotImplementedError, "transpose(x, axes=(1, 0, 2))")
         # x = ones((1, 2, 3))
         # assert transpose(x, (1, 0, 2)).shape == (2, 1, 3)
 
diff --git a/pypy/module/test_lib_pypy/numpypy/core/test_numeric.py b/pypy/module/test_lib_pypy/numpypy/core/test_numeric.py
--- a/pypy/module/test_lib_pypy/numpypy/core/test_numeric.py
+++ b/pypy/module/test_lib_pypy/numpypy/core/test_numeric.py
@@ -1,5 +1,4 @@
-
-from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
+from pypy.module.test_lib_pypy.numpypy.test_base import BaseNumpyAppTest
 
 
 class AppTestBaseRepr(BaseNumpyAppTest):
diff --git a/pypy/module/test_lib_pypy/numpypy/core/test_shape_base.py b/pypy/module/test_lib_pypy/numpypy/core/test_shape_base.py
--- a/pypy/module/test_lib_pypy/numpypy/core/test_shape_base.py
+++ b/pypy/module/test_lib_pypy/numpypy/core/test_shape_base.py
@@ -1,4 +1,4 @@
-from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
+from pypy.module.test_lib_pypy.numpypy.test_base import BaseNumpyAppTest
 
 
 class AppTestShapeBase(BaseNumpyAppTest):
diff --git a/pypy/module/test_lib_pypy/numpypy/lib/test_function_base.py b/pypy/module/test_lib_pypy/numpypy/lib/test_function_base.py
--- a/pypy/module/test_lib_pypy/numpypy/lib/test_function_base.py
+++ b/pypy/module/test_lib_pypy/numpypy/lib/test_function_base.py
@@ -1,4 +1,4 @@
-from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
+from pypy.module.test_lib_pypy.numpypy.test_base import BaseNumpyAppTest
 
 class AppTestFunctionBase(BaseNumpyAppTest):
     def test_average(self):
diff --git a/pypy/module/test_lib_pypy/numpypy/lib/test_shape_base_lib.py b/pypy/module/test_lib_pypy/numpypy/lib/test_shape_base_lib.py
--- a/pypy/module/test_lib_pypy/numpypy/lib/test_shape_base_lib.py
+++ b/pypy/module/test_lib_pypy/numpypy/lib/test_shape_base_lib.py
@@ -1,4 +1,4 @@
-from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
+from pypy.module.test_lib_pypy.numpypy.test_base import BaseNumpyAppTest
 
 class AppTestShapeBase(BaseNumpyAppTest):
     def test_dstack(self):
diff --git a/pypy/module/test_lib_pypy/numpypy/lib/test_twodim_base.py b/pypy/module/test_lib_pypy/numpypy/lib/test_twodim_base.py
--- a/pypy/module/test_lib_pypy/numpypy/lib/test_twodim_base.py
+++ b/pypy/module/test_lib_pypy/numpypy/lib/test_twodim_base.py
@@ -1,4 +1,4 @@
-from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
+from pypy.module.test_lib_pypy.numpypy.test_base import BaseNumpyAppTest
 
 class AppTestTwoDimBase(BaseNumpyAppTest):
     def test_eye(self):
diff --git a/pypy/module/test_lib_pypy/numpypy/test_base.py b/pypy/module/test_lib_pypy/numpypy/test_base.py
new file mode 100644
--- /dev/null
+++ b/pypy/module/test_lib_pypy/numpypy/test_base.py
@@ -0,0 +1,9 @@
+class BaseNumpyAppTest(object):
+    @classmethod
+    def setup_class(cls):
+        if cls.runappdirect:
+            import numpy
+            import sys
+            sys.modules['numpypy'] = numpy
+        else:
+            skip("app-level tests")
diff --git a/pypy/module/test_lib_pypy/numpypy/test_numpy.py b/pypy/module/test_lib_pypy/numpypy/test_numpy.py
--- a/pypy/module/test_lib_pypy/numpypy/test_numpy.py
+++ b/pypy/module/test_lib_pypy/numpypy/test_numpy.py
@@ -1,6 +1,6 @@
 from pypy.conftest import option
 import py, sys
-from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
+from pypy.module.test_lib_pypy.numpypy.test_base import BaseNumpyAppTest
 
 class AppTestNumpy(BaseNumpyAppTest):
     def test_min_max_after_import(self):