Merge pull request #7099 from seberg/suppressed_warnings

Suppressed warnings

2 files changed, 11 insertions, 7 deletions

diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py
index a89378acd..a353271de 100644
--- a/numpy/linalg/tests/test_linalg.py
+++ b/numpy/linalg/tests/test_linalg.py
@@ -18,7 +18,7 @@ from numpy.linalg.linalg import _multi_dot_matrix_chain_order
 from numpy.testing import (
     assert_, assert_equal, assert_raises, assert_array_equal,
     assert_almost_equal, assert_allclose, run_module_suite,
-    dec, SkipTest
+    dec, SkipTest, suppress_warnings
 )
 
 
@@ -861,8 +861,8 @@ class _TestNorm(object):
             assert_(issubclass(an.dtype.type, np.floating))
             assert_almost_equal(an, 0.0)
 
-            with warnings.catch_warnings():
-                warnings.simplefilter("ignore", RuntimeWarning)
+            with suppress_warnings() as sup:
+                sup.filter(RuntimeWarning, "divide by zero encountered")
                 an = norm(at, -1)
                 assert_(issubclass(an.dtype.type, np.floating))
                 assert_almost_equal(an, 0.0)
@@ -906,8 +906,8 @@ class _TestNorm(object):
             assert_(issubclass(an.dtype.type, np.floating))
             assert_almost_equal(an, 2.0)
 
-            with warnings.catch_warnings():
-                warnings.simplefilter("ignore", RuntimeWarning)
+            with suppress_warnings() as sup:
+                sup.filter(RuntimeWarning, "divide by zero encountered")
                 an = norm(at, -1)
                 assert_(issubclass(an.dtype.type, np.floating))
                 assert_almost_equal(an, 1.0)
diff --git a/numpy/linalg/tests/test_regression.py b/numpy/linalg/tests/test_regression.py
index 6991628fb..d2080b709 100644
--- a/numpy/linalg/tests/test_regression.py
+++ b/numpy/linalg/tests/test_regression.py
@@ -2,6 +2,8 @@
 """
 from __future__ import division, absolute_import, print_function
 
+import warnings
+
 import numpy as np
 from numpy import linalg, arange, float64, array, dot, transpose
 from numpy.testing import (
@@ -110,8 +112,10 @@ class TestRegression(TestCase):
         self.assertRaises(ValueError, linalg.norm, testvector, ord='nuc')
         self.assertRaises(ValueError, linalg.norm, testvector, ord=np.inf)
         self.assertRaises(ValueError, linalg.norm, testvector, ord=-np.inf)
-        self.assertRaises((AttributeError, DeprecationWarning),
-                          linalg.norm, testvector, ord=0)
+        with warnings.catch_warnings():
+            warnings.simplefilter("error", DeprecationWarning)
+            self.assertRaises((AttributeError, DeprecationWarning),
+                              linalg.norm, testvector, ord=0)
         self.assertRaises(ValueError, linalg.norm, testvector, ord=-1)
         self.assertRaises(ValueError, linalg.norm, testvector, ord=-2)