summaryrefslogtreecommitdiff
path: root/numpy/matrixlib/tests
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-09-04 12:41:42 -0600
committerCharles Harris <charlesr.harris@gmail.com>2014-09-04 12:41:42 -0600
commit3ab6ec8e16906fc471f3c49400c62ce0857d5404 (patch)
tree2b61cb5ff177ac801a4a083dd98804e7befc16aa /numpy/matrixlib/tests
parent03dcd3b754d9a618c0c2c8c72bb225565758bbf5 (diff)
parent949daeaf42b3e7687eebf7eb764e63a5eec336ea (diff)
downloadnumpy-3ab6ec8e16906fc471f3c49400c62ce0857d5404.tar.gz
Merge pull request #5042 from juliantaylor/test-argv
TST: pass sys.argv to run_module_suite by default
Diffstat (limited to 'numpy/matrixlib/tests')
-rw-r--r--numpy/matrixlib/tests/test_multiarray.py3
-rw-r--r--numpy/matrixlib/tests/test_numeric.py5
-rw-r--r--numpy/matrixlib/tests/test_regression.py3
3 files changed, 10 insertions, 1 deletions
diff --git a/numpy/matrixlib/tests/test_multiarray.py b/numpy/matrixlib/tests/test_multiarray.py
index fc5b1df17..64d63f125 100644
--- a/numpy/matrixlib/tests/test_multiarray.py
+++ b/numpy/matrixlib/tests/test_multiarray.py
@@ -16,3 +16,6 @@ class TestView(TestCase):
assert_(isinstance(y, np.matrix))
assert_equal(y.dtype, np.dtype('<i2'))
+
+if __name__ == "__main__":
+ run_module_suite()
diff --git a/numpy/matrixlib/tests/test_numeric.py b/numpy/matrixlib/tests/test_numeric.py
index fa88f5288..3588de5e6 100644
--- a/numpy/matrixlib/tests/test_numeric.py
+++ b/numpy/matrixlib/tests/test_numeric.py
@@ -1,6 +1,6 @@
from __future__ import division, absolute_import, print_function
-from numpy.testing import assert_equal, TestCase
+from numpy.testing import assert_equal, TestCase, run_module_suite
from numpy.core import ones
from numpy import matrix
@@ -8,3 +8,6 @@ class TestDot(TestCase):
def test_matscalar(self):
b1 = matrix(ones((3, 3), dtype=complex))
assert_equal(b1*1.0, b1)
+
+if __name__ == "__main__":
+ run_module_suite()
diff --git a/numpy/matrixlib/tests/test_regression.py b/numpy/matrixlib/tests/test_regression.py
index 4bbd44dcf..119b21d8a 100644
--- a/numpy/matrixlib/tests/test_regression.py
+++ b/numpy/matrixlib/tests/test_regression.py
@@ -32,3 +32,6 @@ class TestRegression(TestCase):
x = np.asmatrix(np.random.uniform(0, 1, (3, 3)))
self.assertEqual(x.std().shape, ())
self.assertEqual(x.argmax().shape, ())
+
+if __name__ == "__main__":
+ run_module_suite()