diff options
author | Alan McIntyre <alan.mcintyre@local> | 2008-06-21 15:50:17 +0000 |
---|---|---|
committer | Alan McIntyre <alan.mcintyre@local> | 2008-06-21 15:50:17 +0000 |
commit | af7f89ea35ae9dbf38682d3215a20cc13ab0890c (patch) | |
tree | 9be759f8f0d1107b8fddc74fc3fcbb03bcc8f1de /numpy/f2py/lib | |
parent | 03fbbffca884c70d56e08d5551b001dd6b9565c6 (diff) | |
download | numpy-af7f89ea35ae9dbf38682d3215a20cc13ab0890c.tar.gz |
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.
Diffstat (limited to 'numpy/f2py/lib')
-rw-r--r-- | numpy/f2py/lib/parser/test_Fortran2003.py | 2 | ||||
-rw-r--r-- | numpy/f2py/lib/parser/test_parser.py | 2 | ||||
-rw-r--r-- | numpy/f2py/lib/tests/test_derived_scalar.py | 2 | ||||
-rw-r--r-- | numpy/f2py/lib/tests/test_module_module.py | 2 | ||||
-rw-r--r-- | numpy/f2py/lib/tests/test_module_scalar.py | 2 | ||||
-rw-r--r-- | numpy/f2py/lib/tests/test_scalar_function_in.py | 2 | ||||
-rw-r--r-- | numpy/f2py/lib/tests/test_scalar_in_out.py | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/numpy/f2py/lib/parser/test_Fortran2003.py b/numpy/f2py/lib/parser/test_Fortran2003.py index b8e8fd998..2e61a636d 100644 --- a/numpy/f2py/lib/parser/test_Fortran2003.py +++ b/numpy/f2py/lib/parser/test_Fortran2003.py @@ -2098,4 +2098,4 @@ if 1: print '-----' if __name__ == "__main__": - nose.run(argv=['', __file__]) + run_module_suite() diff --git a/numpy/f2py/lib/parser/test_parser.py b/numpy/f2py/lib/parser/test_parser.py index 6770ac4a5..f242b867f 100644 --- a/numpy/f2py/lib/parser/test_parser.py +++ b/numpy/f2py/lib/parser/test_parser.py @@ -494,4 +494,4 @@ class TestStatements(TestCase): if __name__ == "__main__": - nose.run(argv=['', __file__]) + run_module_suite() diff --git a/numpy/f2py/lib/tests/test_derived_scalar.py b/numpy/f2py/lib/tests/test_derived_scalar.py index 76b54ae51..a7a93b07b 100644 --- a/numpy/f2py/lib/tests/test_derived_scalar.py +++ b/numpy/f2py/lib/tests/test_derived_scalar.py @@ -71,4 +71,4 @@ class TestM(TestCase): if __name__ == "__main__": - nose.run(argv=['', __file__]) + run_module_suite() diff --git a/numpy/f2py/lib/tests/test_module_module.py b/numpy/f2py/lib/tests/test_module_module.py index 53348b5d8..0eec2f586 100644 --- a/numpy/f2py/lib/tests/test_module_module.py +++ b/numpy/f2py/lib/tests/test_module_module.py @@ -58,4 +58,4 @@ class TestM(TestCase): foo() if __name__ == "__main__": - nose.run(argv=['', __file__]) + run_module_suite() diff --git a/numpy/f2py/lib/tests/test_module_scalar.py b/numpy/f2py/lib/tests/test_module_scalar.py index 684fab1b2..e988a8e5f 100644 --- a/numpy/f2py/lib/tests/test_module_scalar.py +++ b/numpy/f2py/lib/tests/test_module_scalar.py @@ -55,4 +55,4 @@ class TestM(TestCase): assert_equal(r,4) if __name__ == "__main__": - nose.run(argv=['', __file__]) + run_module_suite() diff --git a/numpy/f2py/lib/tests/test_scalar_function_in.py b/numpy/f2py/lib/tests/test_scalar_function_in.py index f2497d065..ba8e23b48 100644 --- a/numpy/f2py/lib/tests/test_scalar_function_in.py +++ b/numpy/f2py/lib/tests/test_scalar_function_in.py @@ -530,4 +530,4 @@ class TestM(TestCase): if __name__ == "__main__": - nose.run(argv=['', __file__]) + run_module_suite() diff --git a/numpy/f2py/lib/tests/test_scalar_in_out.py b/numpy/f2py/lib/tests/test_scalar_in_out.py index 2f8ccceab..c0f10be89 100644 --- a/numpy/f2py/lib/tests/test_scalar_in_out.py +++ b/numpy/f2py/lib/tests/test_scalar_in_out.py @@ -527,4 +527,4 @@ class TestM(TestCase): if __name__ == "__main__": - nose.run(argv=['', __file__]) + run_module_suite() |