Merge pull request #5020 from charris/disable-some-test-warnings

TST: Silence some warning that turns up on OpenBSD.
numpy · Sep 2, 2014 · 588bcc4 · 588bcc4
2 parents 4a501a0 + affeaf5
commit 588bcc4
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py
@@ -333,11 +333,10 @@ def test_log1p(self):
         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)