summaryrefslogtreecommitdiff
path: root/numpy/ma/tests
diff options
context:
space:
mode:
authorMark Wiebe <mwiebe@enthought.com>2011-06-06 11:44:08 -0500
committerMark Wiebe <mwiebe@enthought.com>2011-06-22 09:09:07 -0500
commita72132dce48e7c2b0f514258e05a40ab78850162 (patch)
treeb383ae9fa6aeae733cd1768a9849e1c04676ace7 /numpy/ma/tests
parentc149545d31e9fb9ba28075fc0a58cb836eab0f8a (diff)
downloadnumpy-a72132dce48e7c2b0f514258e05a40ab78850162.tar.gz
ENH: ma: Fix up ma and its tests to work with default same_kind casting
Diffstat (limited to 'numpy/ma/tests')
-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 2a2a76c24..b4ec3e540 100644
--- a/numpy/ma/tests/test_core.py
+++ b/numpy/ma/tests/test_core.py
@@ -1031,7 +1031,7 @@ class TestMaskedArrayArithmetic(TestCase):
def test_noshrinking(self):
"Check that we don't shrink a mask when not wanted"
# Binary operations
- a = masked_array([1, 2, 3], mask=[False, False, False], shrink=False)
+ a = masked_array([1., 2., 3.], mask=[False, False, False], shrink=False)
b = a + 1
assert_equal(b.mask, [0, 0, 0])
# In place binary operation
@@ -1646,7 +1646,7 @@ class TestMaskedArrayInPlaceArithmetics(TestCase):
"""Test of inplace additions"""
(x, y, xm) = self.intdata
m = xm.mask
- a = arange(10, dtype=float)
+ a = arange(10, dtype=np.int16)
a[-1] = masked
x += a
xm += a