summaryrefslogtreecommitdiff
path: root/numpy/lib/tests/test_arraysetops.py
diff options
context:
space:
mode:
authormattip <matti.picus@gmail.com>2019-01-10 12:16:16 +0200
committermattip <matti.picus@gmail.com>2019-01-10 20:09:43 +0200
commitc088383cb290ca064d456e89d79177a0e234cb8d (patch)
tree1f9d1949cfbd36a59d2ed6d4487353c85a9cfbe6 /numpy/lib/tests/test_arraysetops.py
parentac7f2e46353c6a16dcce3654bae1b93b3c10c516 (diff)
downloadnumpy-c088383cb290ca064d456e89d79177a0e234cb8d.tar.gz
BUG: loosen kwargs requirements in ediff1d
Diffstat (limited to 'numpy/lib/tests/test_arraysetops.py')
-rw-r--r--numpy/lib/tests/test_arraysetops.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/lib/tests/test_arraysetops.py b/numpy/lib/tests/test_arraysetops.py
index a17fc66e5..93d4b279f 100644
--- a/numpy/lib/tests/test_arraysetops.py
+++ b/numpy/lib/tests/test_arraysetops.py
@@ -136,8 +136,8 @@ class TestSetOps(object):
np.nan),
# should fail because attempting
# to downcast to smaller int type:
- (np.array([1, 2, 3], dtype=np.int32),
- np.array([5, 7, 2], dtype=np.int64),
+ (np.array([1, 2, 3], dtype=np.int16),
+ np.array([5, 1<<20, 2], dtype=np.int32),
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 = 'must be compatible'
- with assert_raises_regex(TypeError, msg):
+ msg = 'cannot convert'
+ with assert_raises_regex(ValueError, msg):
ediff1d(ary=ary,
to_end=append,
to_begin=prepend)