summaryrefslogtreecommitdiff
path: root/numpy/distutils/tests
diff options
context:
space:
mode:
authorAlan McIntyre <alan.mcintyre@local>2008-06-21 15:50:17 +0000
committerAlan McIntyre <alan.mcintyre@local>2008-06-21 15:50:17 +0000
commitaf7f89ea35ae9dbf38682d3215a20cc13ab0890c (patch)
tree9be759f8f0d1107b8fddc74fc3fcbb03bcc8f1de /numpy/distutils/tests
parent03fbbffca884c70d56e08d5551b001dd6b9565c6 (diff)
downloadnumpy-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/distutils/tests')
-rw-r--r--numpy/distutils/tests/f2py_ext/tests/test_fib2.py2
-rw-r--r--numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py2
-rw-r--r--numpy/distutils/tests/gen_ext/tests/test_fib3.py2
-rw-r--r--numpy/distutils/tests/pyrex_ext/tests/test_primes.py2
-rw-r--r--numpy/distutils/tests/swig_ext/tests/test_example.py2
-rw-r--r--numpy/distutils/tests/swig_ext/tests/test_example2.py2
-rw-r--r--numpy/distutils/tests/test_fcompiler_gnu.py2
-rw-r--r--numpy/distutils/tests/test_misc_util.py2
8 files changed, 8 insertions, 8 deletions
diff --git a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
index 295397aad..8ea7bbfe5 100644
--- a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
+++ b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
@@ -10,4 +10,4 @@ class TestFib2(TestCase):
assert_array_equal(fib2.fib(6),[0,1,1,2,3,5])
if __name__ == "__main__":
- nose.run(argv=['', __file__])
+ run_module_suite()
diff --git a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
index 40402e949..4e2bb0cf4 100644
--- a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
+++ b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
@@ -10,4 +10,4 @@ class TestFoo(TestCase):
assert_equal(foo.foo_free.bar13(),13)
if __name__ == "__main__":
- nose.run(argv=['', __file__])
+ run_module_suite()
diff --git a/numpy/distutils/tests/gen_ext/tests/test_fib3.py b/numpy/distutils/tests/gen_ext/tests/test_fib3.py
index 0c1e2d60d..59e41fbbe 100644
--- a/numpy/distutils/tests/gen_ext/tests/test_fib3.py
+++ b/numpy/distutils/tests/gen_ext/tests/test_fib3.py
@@ -10,4 +10,4 @@ class TestFib3(TestCase):
assert_array_equal(fib3.fib(6),[0,1,1,2,3,5])
if __name__ == "__main__":
- nose.run(argv=['', __file__])
+ run_module_suite()
diff --git a/numpy/distutils/tests/pyrex_ext/tests/test_primes.py b/numpy/distutils/tests/pyrex_ext/tests/test_primes.py
index c08da8651..7fe03e97f 100644
--- a/numpy/distutils/tests/pyrex_ext/tests/test_primes.py
+++ b/numpy/distutils/tests/pyrex_ext/tests/test_primes.py
@@ -10,4 +10,4 @@ class TestPrimes(TestCase):
l = primes(10)
assert_equal(l, [2, 3, 5, 7, 11, 13, 17, 19, 23, 29])
if __name__ == "__main__":
- nose.run(argv=['', __file__])
+ run_module_suite()
diff --git a/numpy/distutils/tests/swig_ext/tests/test_example.py b/numpy/distutils/tests/swig_ext/tests/test_example.py
index 6a3895295..11dea220f 100644
--- a/numpy/distutils/tests/swig_ext/tests/test_example.py
+++ b/numpy/distutils/tests/swig_ext/tests/test_example.py
@@ -15,4 +15,4 @@ class TestExample(TestCase):
assert_equal(example.cvar.My_variable,5.0)
if __name__ == "__main__":
- nose.run(argv=['', __file__])
+ run_module_suite()
diff --git a/numpy/distutils/tests/swig_ext/tests/test_example2.py b/numpy/distutils/tests/swig_ext/tests/test_example2.py
index 3cb1db201..062c3e6ea 100644
--- a/numpy/distutils/tests/swig_ext/tests/test_example2.py
+++ b/numpy/distutils/tests/swig_ext/tests/test_example2.py
@@ -14,4 +14,4 @@ class TestExample2(TestCase):
if __name__ == "__main__":
- nose.run(argv=['', __file__])
+ run_module_suite()
diff --git a/numpy/distutils/tests/test_fcompiler_gnu.py b/numpy/distutils/tests/test_fcompiler_gnu.py
index 99384bc8f..8158bb749 100644
--- a/numpy/distutils/tests/test_fcompiler_gnu.py
+++ b/numpy/distutils/tests/test_fcompiler_gnu.py
@@ -49,4 +49,4 @@ class TestGortranVersions(TestCase):
if __name__ == '__main__':
- nose.run(argv=['', __file__])
+ run_module_suite()
diff --git a/numpy/distutils/tests/test_misc_util.py b/numpy/distutils/tests/test_misc_util.py
index fed1567b7..6130d0eea 100644
--- a/numpy/distutils/tests/test_misc_util.py
+++ b/numpy/distutils/tests/test_misc_util.py
@@ -58,4 +58,4 @@ class TestGpaths(TestCase):
if __name__ == "__main__":
- nose.run(argv=['', __file__])
+ run_module_suite()