Author: mattip <[email protected]>
Branch:
Changeset: r61099:5b7bc878b043
Date: 2013-02-11 20:38 +0200
http://bitbucket.org/pypy/pypy/changeset/5b7bc878b043/
Log: unskip concatenate tests
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
@@ -88,7 +88,7 @@
np.ones((a.shape[0] + b.shape[0],
a.shape[1])))
- skip("https://bugs.pypy.org/issue1394";)
+ #skip("https://bugs.pypy.org/issue1394";)
for shape1, shape2 in [[(3, 2, 4), (7, 2, 4)],
[(0, 2, 7), (10, 2, 7)],
[(0, 2, 7), (0, 2, 7)]]:
@@ -119,7 +119,7 @@
np.ones((a.shape[0],
a.shape[1] + b.shape[1])))
- skip("https://bugs.pypy.org/issue1394";)
+ #skip("https://bugs.pypy.org/issue1394";)
for shape1, shape2 in [[(2, 3, 4), (2, 7, 4)],
[(1, 4, 7), (1, 10, 7)],
[(1, 4, 7), (1, 0, 7)],
@@ -129,7 +129,7 @@
np.ones((a.shape[0],
a.shape[1] + b.shape[1],
a.shape[2])))
-
+
def test_dstack(self):
import numpypy as np
a = np.array((1, 2, 3))
@@ -142,7 +142,7 @@
c = np.dstack((a, b))
assert np.array_equal(c, [[[1, 2]], [[2, 3]], [[3, 4]]])
- skip("https://bugs.pypy.org/issue1394";)
+ #skip("https://bugs.pypy.org/issue1394";)
for shape1, shape2 in [[(4, 2, 3), (4, 2, 7)],
[(7, 2, 0), (7, 2, 10)],
[(7, 2, 0), (7, 2, 0)]]:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
