TST: Remove unittest dependencies in numpy/linalg/tests.

1 files changed, 25 insertions, 25 deletions

diff --git a/numpy/linalg/tests/test_regression.py b/numpy/linalg/tests/test_regression.py
index d2080b709..558abca09 100644
--- a/numpy/linalg/tests/test_regression.py
+++ b/numpy/linalg/tests/test_regression.py
@@ -7,7 +7,7 @@ import warnings
 import numpy as np
 from numpy import linalg, arange, float64, array, dot, transpose
 from numpy.testing import (
-    TestCase, run_module_suite, assert_equal, assert_array_equal,
+    run_module_suite, assert_, assert_raises, assert_equal, assert_array_equal,
     assert_array_almost_equal, assert_array_less
 )
 
@@ -15,7 +15,7 @@ from numpy.testing import (
 rlevel = 1
 
 
-class TestRegression(TestCase):
+class TestRegression(object):
 
     def test_eig_build(self, level=rlevel):
         # Ticket #652
@@ -64,7 +64,7 @@ class TestRegression(TestCase):
     def test_norm_vector_badarg(self):
         # Regression for #786: Froebenius norm for vectors raises
         # TypeError.
-        self.assertRaises(ValueError, linalg.norm, array([1., 2., 3.]), 'fro')
+        assert_raises(ValueError, linalg.norm, array([1., 2., 3.]), 'fro')
 
     def test_lapack_endian(self):
         # For bug #1482
@@ -98,47 +98,47 @@ class TestRegression(TestCase):
 
         norm = linalg.norm(testvector)
         assert_array_equal(norm, [0, 1])
-        self.assertEqual(norm.dtype, np.dtype('float64'))
+        assert_(norm.dtype == np.dtype('float64'))
 
         norm = linalg.norm(testvector, ord=1)
         assert_array_equal(norm, [0, 1])
-        self.assertNotEqual(norm.dtype, np.dtype('float64'))
+        assert_(norm.dtype != np.dtype('float64'))
 
         norm = linalg.norm(testvector, ord=2)
         assert_array_equal(norm, [0, 1])
-        self.assertEqual(norm.dtype, np.dtype('float64'))
+        assert_(norm.dtype == np.dtype('float64'))
 
-        self.assertRaises(ValueError, linalg.norm, testvector, ord='fro')
-        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)
+        assert_raises(ValueError, linalg.norm, testvector, ord='fro')
+        assert_raises(ValueError, linalg.norm, testvector, ord='nuc')
+        assert_raises(ValueError, linalg.norm, testvector, ord=np.inf)
+        assert_raises(ValueError, linalg.norm, testvector, ord=-np.inf)
         with warnings.catch_warnings():
             warnings.simplefilter("error", DeprecationWarning)
-            self.assertRaises((AttributeError, DeprecationWarning),
+            assert_raises((AttributeError, DeprecationWarning),
                               linalg.norm, testvector, ord=0)
-        self.assertRaises(ValueError, linalg.norm, testvector, ord=-1)
-        self.assertRaises(ValueError, linalg.norm, testvector, ord=-2)
+        assert_raises(ValueError, linalg.norm, testvector, ord=-1)
+        assert_raises(ValueError, linalg.norm, testvector, ord=-2)
 
         testmatrix = np.array([[np.array([0, 1]), 0, 0],
                                [0,                0, 0]], dtype=object)
 
         norm = linalg.norm(testmatrix)
         assert_array_equal(norm, [0, 1])
-        self.assertEqual(norm.dtype, np.dtype('float64'))
+        assert_(norm.dtype == np.dtype('float64'))
 
         norm = linalg.norm(testmatrix, ord='fro')
         assert_array_equal(norm, [0, 1])
-        self.assertEqual(norm.dtype, np.dtype('float64'))
-
-        self.assertRaises(TypeError, linalg.norm, testmatrix, ord='nuc')
-        self.assertRaises(ValueError, linalg.norm, testmatrix, ord=np.inf)
-        self.assertRaises(ValueError, linalg.norm, testmatrix, ord=-np.inf)
-        self.assertRaises(ValueError, linalg.norm, testmatrix, ord=0)
-        self.assertRaises(ValueError, linalg.norm, testmatrix, ord=1)
-        self.assertRaises(ValueError, linalg.norm, testmatrix, ord=-1)
-        self.assertRaises(TypeError, linalg.norm, testmatrix, ord=2)
-        self.assertRaises(TypeError, linalg.norm, testmatrix, ord=-2)
-        self.assertRaises(ValueError, linalg.norm, testmatrix, ord=3)
+        assert_(norm.dtype == np.dtype('float64'))
+
+        assert_raises(TypeError, linalg.norm, testmatrix, ord='nuc')
+        assert_raises(ValueError, linalg.norm, testmatrix, ord=np.inf)
+        assert_raises(ValueError, linalg.norm, testmatrix, ord=-np.inf)
+        assert_raises(ValueError, linalg.norm, testmatrix, ord=0)
+        assert_raises(ValueError, linalg.norm, testmatrix, ord=1)
+        assert_raises(ValueError, linalg.norm, testmatrix, ord=-1)
+        assert_raises(TypeError, linalg.norm, testmatrix, ord=2)
+        assert_raises(TypeError, linalg.norm, testmatrix, ord=-2)
+        assert_raises(ValueError, linalg.norm, testmatrix, ord=3)
 
 
 if __name__ == '__main__':