summaryrefslogtreecommitdiff
path: root/numpy/matrixlib/tests/test_regression.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2017-07-17 10:38:35 -0600
committerCharles Harris <charlesr.harris@gmail.com>2017-07-17 11:57:52 -0600
commit5381c68ec30e43830290d210362adc4297f96902 (patch)
tree69d73017639c79ea3d29dc818a60137f8a63ee77 /numpy/matrixlib/tests/test_regression.py
parent110825244a1555f594b585c72568084f1863ca1b (diff)
downloadnumpy-5381c68ec30e43830290d210362adc4297f96902.tar.gz
TST: Remove unittest dependencies in matrixlib/tests.
Diffstat (limited to 'numpy/matrixlib/tests/test_regression.py')
-rw-r--r--numpy/matrixlib/tests/test_regression.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/numpy/matrixlib/tests/test_regression.py b/numpy/matrixlib/tests/test_regression.py
index 0839fbf28..b681374f2 100644
--- a/numpy/matrixlib/tests/test_regression.py
+++ b/numpy/matrixlib/tests/test_regression.py
@@ -1,11 +1,13 @@
from __future__ import division, absolute_import, print_function
import numpy as np
-from numpy.testing import TestCase, run_module_suite, assert_, assert_equal
+from numpy.testing import (
+ run_module_suite, assert_, assert_equal, assert_raises
+ )
rlevel = 1
-class TestRegression(TestCase):
+class TestRegression(object):
def test_kron_matrix(self, level=rlevel):
# Ticket #71
x = np.matrix('[1 0; 1 0]')
@@ -25,13 +27,13 @@ class TestRegression(TestCase):
def mul():
np.mat(np.eye(2))*np.ones(2)
- self.assertRaises(ValueError, mul)
+ assert_raises(ValueError, mul)
def test_matrix_std_argmax(self,level=rlevel):
# Ticket #83
x = np.asmatrix(np.random.uniform(0, 1, (3, 3)))
- self.assertEqual(x.std().shape, ())
- self.assertEqual(x.argmax().shape, ())
+ assert_equal(x.std().shape, ())
+ assert_equal(x.argmax().shape, ())
if __name__ == "__main__":
run_module_suite()