diff options
Diffstat (limited to 'numpy/lib/tests/test_arraysetops.py')
| -rw-r--r-- | numpy/lib/tests/test_arraysetops.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/numpy/lib/tests/test_arraysetops.py b/numpy/lib/tests/test_arraysetops.py index fd21a7f76..1d38d8d27 100644 --- a/numpy/lib/tests/test_arraysetops.py +++ b/numpy/lib/tests/test_arraysetops.py @@ -135,9 +135,9 @@ class TestSetOps(object): None, np.nan), # should fail because attempting - # to downcast to smaller int type: - (np.array([1, 2, 3], dtype=np.int16), - np.array([5, 1<<20, 2], dtype=np.int32), + # to downcast to int type: + (np.array([1, 2, 3], dtype=np.int64), + np.array([5, 7, 2], dtype=np.float32), None), # should fail because attempting to cast # two special floating point values @@ -152,8 +152,8 @@ class TestSetOps(object): # specifically, raise an appropriate # Exception when attempting to append or # prepend with an incompatible type - msg = 'cannot convert' - with assert_raises_regex(ValueError, msg): + msg = 'must be compatible' + with assert_raises_regex(TypeError, msg): ediff1d(ary=ary, to_end=append, to_begin=prepend) @@ -163,9 +163,13 @@ class TestSetOps(object): "append," "expected", [ (np.array([1, 2, 3], dtype=np.int16), - 0, + 2**16, # will be cast to int16 under same kind rule. + 2**16 + 4, + np.array([0, 1, 1, 4], dtype=np.int16)), + (np.array([1, 2, 3], dtype=np.float32), + np.array([5], dtype=np.float64), None, - np.array([0, 1, 1], dtype=np.int16)), + np.array([5, 1, 1], dtype=np.float32)), (np.array([1, 2, 3], dtype=np.int32), 0, 0, @@ -187,6 +191,7 @@ class TestSetOps(object): to_end=append, to_begin=prepend) assert_equal(actual, expected) + assert actual.dtype == expected.dtype def test_isin(self): |