summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseberg <sebastian@sipsolutions.net>2015-12-09 10:39:45 +0100
committerseberg <sebastian@sipsolutions.net>2015-12-09 10:39:45 +0100
commit6d323aea603c9c077d9c84db91bf7fb6fd1a34e9 (patch)
tree5bb29f080352e5b355a12f1346a7a1550108d5ce
parentdfdd1884591928e07231ec772a05a9ce490060b8 (diff)
parent9d11602007923310d996ebed636281afe940c783 (diff)
downloadnumpy-6d323aea603c9c077d9c84db91bf7fb6fd1a34e9.tar.gz
Merge pull request #6797 from njsmith/clean-up-builtin-alias-usages
[TST] fix test_dtype_error to actually test what it's supposed to
-rw-r--r--numpy/lib/tests/test_nanfunctions.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/lib/tests/test_nanfunctions.py b/numpy/lib/tests/test_nanfunctions.py
index f418504c2..7a7b37b98 100644
--- a/numpy/lib/tests/test_nanfunctions.py
+++ b/numpy/lib/tests/test_nanfunctions.py
@@ -395,12 +395,12 @@ class TestNanFunctions_MeanVarStd(TestCase, SharedNanFunctionsTestsMixin):
def test_dtype_error(self):
for f in self.nanfuncs:
- for dtype in [np.bool_, np.int_, np.object]:
- assert_raises(TypeError, f, _ndat, axis=1, dtype=np.int)
+ for dtype in [np.bool_, np.int_, np.object_]:
+ assert_raises(TypeError, f, _ndat, axis=1, dtype=dtype)
def test_out_dtype_error(self):
for f in self.nanfuncs:
- for dtype in [np.bool_, np.int_, np.object]:
+ for dtype in [np.bool_, np.int_, np.object_]:
out = np.empty(_ndat.shape[0], dtype=dtype)
assert_raises(TypeError, f, _ndat, axis=1, out=out)