summaryrefslogtreecommitdiff
path: root/numpy/ma
diff options
context:
space:
mode:
authorMark Wiebe <mwiebe@enthought.com>2011-08-02 14:20:29 -0500
committerCharles Harris <charlesr.harris@gmail.com>2011-08-27 07:26:50 -0600
commit0375181e807f9def0e1bd0279214f5a00ec55485 (patch)
treefdab425223042d79e24acca135ef57d7a9e7e27a /numpy/ma
parentaed9925a9d5fe9a407d0ca2c65cb577116c4d0f1 (diff)
downloadnumpy-0375181e807f9def0e1bd0279214f5a00ec55485.tar.gz
TST: ufunc: Tweak ma test to have a good output parameter, disable crashing NA test temporarily
Diffstat (limited to 'numpy/ma')
-rw-r--r--numpy/ma/tests/test_core.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
index d82f3bd81..91a3c4021 100644
--- a/numpy/ma/tests/test_core.py
+++ b/numpy/ma/tests/test_core.py
@@ -2034,7 +2034,7 @@ class TestMaskedArrayMethods(TestCase):
def test_allany_oddities(self):
"Some fun with all and any"
- store = empty(1, dtype=bool)
+ store = empty((), dtype=bool)
full = array([1, 2, 3], mask=True)
#
self.assertTrue(full.all() is masked)
@@ -2043,7 +2043,7 @@ class TestMaskedArrayMethods(TestCase):
self.assertTrue(store._mask, True)
self.assertTrue(store is not masked)
#
- store = empty(1, dtype=bool)
+ store = empty((), dtype=bool)
self.assertTrue(full.any() is masked)
full.any(out=store)
self.assertTrue(not store)