Merge pull request #7099 from seberg/suppressed_warnings

Suppressed warnings

1 files changed, 6 insertions, 2 deletions

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)