summaryrefslogtreecommitdiff
path: root/numpy/lib/tests/test_function_base.py
diff options
context:
space:
mode:
authorTravis E. Oliphant <teoliphant@gmail.com>2012-07-17 22:47:06 -0500
committerTravis E. Oliphant <teoliphant@gmail.com>2012-07-17 22:47:06 -0500
commit5b4e61b8a18d79385d503624886d9d5f2038b31b (patch)
tree2d050f7419ba815d6b222fd8c6002cfa7fb9e4b5 /numpy/lib/tests/test_function_base.py
parent88cf94d5ddc1c42e2ff078dc4fbb3c626efedae3 (diff)
downloadnumpy-5b4e61b8a18d79385d503624886d9d5f2038b31b.tar.gz
BUG: Fix some tests in PR #192
Diffstat (limited to 'numpy/lib/tests/test_function_base.py')
-rw-r--r--numpy/lib/tests/test_function_base.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
index db242153d..7c1b01345 100644
--- a/numpy/lib/tests/test_function_base.py
+++ b/numpy/lib/tests/test_function_base.py
@@ -1185,12 +1185,12 @@ class TestMeshgrid(TestCase):
x = [1, 2, 3]
y = [4, 5, 6, 7]
[X, Y] = meshgrid(x, y, indexing='ij')
- assert_(all(X == array([[1, 1, 1, 1],
- [2, 2, 2, 2],
- [3, 3, 3, 3]])))
- assert_(all(Y == array([[4, 5, 6, 7],
- [4, 5, 6, 7],
- [4, 5, 6, 7]])))
+ assert_(np.all(X == np.array([[1, 1, 1, 1],
+ [2, 2, 2, 2],
+ [3, 3, 3, 3]])))
+ assert_(np.all(Y == np.array([[4, 5, 6, 7],
+ [4, 5, 6, 7],
+ [4, 5, 6, 7]])))
# Test expected shapes:
z = [8, 9]
@@ -1203,8 +1203,8 @@ class TestMeshgrid(TestCase):
def test_sparse(self):
[X, Y] = meshgrid([1, 2, 3], [4, 5, 6, 7], sparse=True)
- assert_(all(X == array([[1, 2, 3]])))
- assert_(all(Y == array([[4], [5], [6], [7]])))
+ assert_(np.all(X == np.array([[1, 2, 3]])))
+ assert_(np.all(Y == np.array([[4], [5], [6], [7]])))
class TestPiecewise(TestCase):