From af7f89ea35ae9dbf38682d3215a20cc13ab0890c Mon Sep 17 00:00:00 2001 From: Alan McIntyre Date: Sat, 21 Jun 2008 15:50:17 +0000 Subject: Restore old test framework classes. Added numpy.testing.run_module_suite to simplify "if __name__ == '__main__'" boilerplate code in test modules. Removed numpy/testing/pkgtester.py since it just consisted of an import statement after porting SciPy r4424. Allow numpy.*.test() to accept the old keyword arguments (but issue a deprecation warning when old arguments are seen). numpy.*.test() returns a test result object as before. Fixed typo in distutils doc. --- numpy/linalg/__init__.py | 2 +- numpy/linalg/tests/test_linalg.py | 2 +- numpy/linalg/tests/test_regression.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'numpy/linalg') diff --git a/numpy/linalg/__init__.py b/numpy/linalg/__init__.py index 842c791d2..835fb74a6 100644 --- a/numpy/linalg/__init__.py +++ b/numpy/linalg/__init__.py @@ -3,6 +3,6 @@ from info import __doc__ from linalg import * -from numpy.testing.pkgtester import Tester +from numpy.testing import Tester test = Tester().test bench = Tester().test diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py index 58c5cd456..4481e4831 100644 --- a/numpy/linalg/tests/test_linalg.py +++ b/numpy/linalg/tests/test_linalg.py @@ -205,4 +205,4 @@ class TestBoolPower(TestCase): if __name__ == "__main__": - nose.run(argv=['', __file__]) + run_module_suite() diff --git a/numpy/linalg/tests/test_regression.py b/numpy/linalg/tests/test_regression.py index ec9bc695f..c1b118770 100644 --- a/numpy/linalg/tests/test_regression.py +++ b/numpy/linalg/tests/test_regression.py @@ -56,4 +56,4 @@ class TestRegression(TestCase): if __name__ == '__main__': - nose.run(argv=['', __file__]) + run_module_suite() -- cgit v1.2.1