summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorJulian Taylor <juliantaylor108@gmail.com>2014-09-02 23:07:26 +0200
committerJulian Taylor <juliantaylor108@gmail.com>2014-09-02 23:07:26 +0200
commit588bcc41b7b13aeccbec5b323d18c84e8946d77b (patch)
tree251859bc41730b2c0cf7a1d9fb1a245f8f01b5bf /numpy
parent4a501a066061ae957b6ccfd752f503da6a5e3337 (diff)
parentaffeaf54bd08f42c87d966f03cbdc8a896d4e90f (diff)
downloadnumpy-588bcc41b7b13aeccbec5b323d18c84e8946d77b.tar.gz
Merge pull request #5020 from charris/disable-some-test-warnings
TST: Silence some warning that turns up on OpenBSD.
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/tests/test_umath.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py
index 3030c68ab..e32519316 100644
--- a/numpy/core/tests/test_umath.py
+++ b/numpy/core/tests/test_umath.py
@@ -333,11 +333,10 @@ class TestLog1p(TestCase):
assert_almost_equal(ncu.log1p(1e-6), ncu.log(1+1e-6))
def test_special(self):
- assert_equal(ncu.log1p(np.nan), np.nan)
- assert_equal(ncu.log1p(np.inf), np.inf)
- with np.errstate(divide="ignore"):
+ with np.errstate(invalid="ignore", divide="ignore"):
+ assert_equal(ncu.log1p(np.nan), np.nan)
+ assert_equal(ncu.log1p(np.inf), np.inf)
assert_equal(ncu.log1p(-1.), -np.inf)
- with np.errstate(invalid="ignore"):
assert_equal(ncu.log1p(-2.), np.nan)
assert_equal(ncu.log1p(-np.inf), np.nan)