summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Gommers <ralf.gommers@googlemail.com>2011-04-03 16:36:16 +0200
committerRalf Gommers <ralf.gommers@googlemail.com>2011-04-03 16:36:16 +0200
commit6b6edfd702a0782ff665d009490b02538a5e0b28 (patch)
treeb2adfe24d31a79304257bbc2b1b163e7e6c57a1b
parent841a9a84ee42f06d115be50cbc4847539dd34857 (diff)
downloadnumpy-6b6edfd702a0782ff665d009490b02538a5e0b28.tar.gz
BUG: fix tests in test_linalg.py. Do not subclass from TestCase.
-rw-r--r--numpy/linalg/tests/test_linalg.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py
index a672ed08a..0fc5eb80b 100644
--- a/numpy/linalg/tests/test_linalg.py
+++ b/numpy/linalg/tests/test_linalg.py
@@ -240,7 +240,7 @@ class TestLstsq(LinalgTestCase, LinalgNonsquareTestCase, TestCase):
assert imply(isinstance(b, matrix), isinstance(x, matrix))
assert imply(isinstance(b, matrix), isinstance(residuals, matrix))
-class TestMatrixPower(TestCase):
+class TestMatrixPower():
R90 = array([[0,1],[-1,0]])
Arb22 = array([[4,-7],[-2,10]])
noninv = array([[1,0],[0,0]])
@@ -290,8 +290,8 @@ class TestMatrixPower(TestCase):
def test_invert_noninvertible(self):
import numpy.linalg
- self.assertRaises(numpy.linalg.linalg.LinAlgError,
- lambda: matrix_power(self.noninv,-1))
+ assert_raises(numpy.linalg.linalg.LinAlgError,
+ lambda: matrix_power(self.noninv,-1))
class TestBoolPower(TestCase):
def test_square(self):
@@ -416,7 +416,7 @@ def test_matrix_rank():
# Full rank matrix
yield assert_equal, 4, matrix_rank(np.eye(4))
# rank deficient matrix
- I=np.eye(4); I[-1,-1] = 0.
+ I=np.eye(4); I[-1,-1] = 0.
yield assert_equal, matrix_rank(I), 3
# All zeros - zero rank
yield assert_equal, matrix_rank(np.zeros((4,4))), 0
@@ -429,7 +429,7 @@ def test_matrix_rank():
yield assert_raises, TypeError, matrix_rank, np.zeros((2,2,2))
# works on scalar
yield assert_equal, matrix_rank(1), 1
-
-
+
+
if __name__ == "__main__":
run_module_suite()