MAINT: Remove all uses of run_module_suite.

That function is nose specific and has not worked since `__init__` files
were added to the tests directories.

8 files changed, 10 insertions, 45 deletions

diff --git a/numpy/distutils/tests/test_exec_command.py b/numpy/distutils/tests/test_exec_command.py
index 5e7b3f3e8..8bd265007 100644
--- a/numpy/distutils/tests/test_exec_command.py
+++ b/numpy/distutils/tests/test_exec_command.py
@@ -6,7 +6,7 @@ from tempfile import TemporaryFile
 
 from numpy.distutils import exec_command
 from numpy.distutils.exec_command import get_pythonexe
-from numpy.testing import run_module_suite, tempdir, assert_
+from numpy.testing import tempdir, assert_
 
 # In python 3 stdout, stderr are text (unicode compliant) devices, so to
 # emulate them import StringIO from the io module.
@@ -213,7 +213,3 @@ class TestExecCommand(object):
                     self.check_nt(use_tee=1)
                 self.check_execute_in(use_tee=0)
                 self.check_execute_in(use_tee=1)
-
-
-if __name__ == "__main__":
-    run_module_suite()
diff --git a/numpy/distutils/tests/test_fcompiler_gnu.py b/numpy/distutils/tests/test_fcompiler_gnu.py
index 659520513..49208aace 100644
--- a/numpy/distutils/tests/test_fcompiler_gnu.py
+++ b/numpy/distutils/tests/test_fcompiler_gnu.py
@@ -1,6 +1,6 @@
 from __future__ import division, absolute_import, print_function
 
-from numpy.testing import assert_, run_module_suite
+from numpy.testing import assert_
 
 import numpy.distutils.fcompiler
 
@@ -55,7 +55,3 @@ class TestGFortranVersions(object):
         for vs, _ in g77_version_strings:
             v = fc.version_match(vs)
             assert_(v is None, (vs, v))
-
-
-if __name__ == '__main__':
-    run_module_suite()
diff --git a/numpy/distutils/tests/test_fcompiler_intel.py b/numpy/distutils/tests/test_fcompiler_intel.py
index b13a01788..5e014bada 100644
--- a/numpy/distutils/tests/test_fcompiler_intel.py
+++ b/numpy/distutils/tests/test_fcompiler_intel.py
@@ -1,7 +1,7 @@
 from __future__ import division, absolute_import, print_function
 
 import numpy.distutils.fcompiler
-from numpy.testing import run_module_suite, assert_
+from numpy.testing import assert_
 
 
 intel_32bit_version_strings = [
@@ -30,7 +30,3 @@ class TestIntelEM64TFCompilerVersions(object):
         for vs, version in intel_64bit_version_strings:
             v = fc.version_match(vs)
             assert_(v == version)
-
-
-if __name__ == '__main__':
-    run_module_suite()
diff --git a/numpy/distutils/tests/test_fcompiler_nagfor.py b/numpy/distutils/tests/test_fcompiler_nagfor.py
index d45d3e3ce..1c936056a 100644
--- a/numpy/distutils/tests/test_fcompiler_nagfor.py
+++ b/numpy/distutils/tests/test_fcompiler_nagfor.py
@@ -1,7 +1,6 @@
 from __future__ import division, absolute_import, print_function
 
-from numpy.testing import assert_, run_module_suite
-
+from numpy.testing import assert_
 import numpy.distutils.fcompiler
 
 nag_version_strings = [('nagfor', 'NAG Fortran Compiler Release '
@@ -23,7 +22,3 @@ class TestNagFCompilerVersions(object):
             fc = numpy.distutils.fcompiler.new_fcompiler(compiler=comp)
             v = fc.version_match(vs)
             assert_(v == version)
-
-
-if __name__ == '__main__':
-    run_module_suite()
diff --git a/numpy/distutils/tests/test_from_template.py b/numpy/distutils/tests/test_from_template.py
index d3c513437..588175496 100644
--- a/numpy/distutils/tests/test_from_template.py
+++ b/numpy/distutils/tests/test_from_template.py
@@ -1,6 +1,6 @@
 
 from numpy.distutils.from_template import process_str
-from numpy.testing import assert_equal, run_module_suite
+from numpy.testing import assert_equal
 
 
 pyf_src = """
@@ -42,7 +42,3 @@ def test_from_template():
     normalized_pyf = normalize_whitespace(pyf)
     normalized_expected_pyf = normalize_whitespace(expected_pyf)
     assert_equal(normalized_pyf, normalized_expected_pyf)
-
-
-if __name__ == "__main__":
-    run_module_suite()
diff --git a/numpy/distutils/tests/test_misc_util.py b/numpy/distutils/tests/test_misc_util.py
index dd4dbc842..2a3294ddf 100644
--- a/numpy/distutils/tests/test_misc_util.py
+++ b/numpy/distutils/tests/test_misc_util.py
@@ -4,10 +4,10 @@ from os.path import join, sep, dirname
 
 from numpy.distutils.misc_util import (
     appendpath, minrelpath, gpaths, get_shared_lib_extension, get_info
-)
+    )
 from numpy.testing import (
-    run_module_suite, assert_, assert_equal
-)
+    assert_, assert_equal
+    )
 
 ajoin = lambda *paths: join(*((sep,)+paths))
 
@@ -79,7 +79,3 @@ def test_installed_npymath_ini():
     # Regression test for gh-7707.  If npymath.ini wasn't installed, then this
     # will give an error.
     info = get_info('npymath')
-
-
-if __name__ == "__main__":
-    run_module_suite()
diff --git a/numpy/distutils/tests/test_npy_pkg_config.py b/numpy/distutils/tests/test_npy_pkg_config.py
index 29891b63b..537e16e90 100644
--- a/numpy/distutils/tests/test_npy_pkg_config.py
+++ b/numpy/distutils/tests/test_npy_pkg_config.py
@@ -3,7 +3,7 @@ from __future__ import division, absolute_import, print_function
 import os
 
 from numpy.distutils.npy_pkg_config import read_config, parse_flags
-from numpy.testing import run_module_suite, temppath, assert_
+from numpy.testing import temppath, assert_
 
 simple = """\
 [meta]
@@ -84,7 +84,3 @@ class TestParseFlags(object):
         d = parse_flags("-L /usr/lib -lfoo -L/usr/lib -lbar")
         assert_(d['library_dirs'] == ['/usr/lib', '/usr/lib'])
         assert_(d['libraries'] == ['foo', 'bar'])
-
-
-if __name__ == '__main__':
-    run_module_suite()
diff --git a/numpy/distutils/tests/test_system_info.py b/numpy/distutils/tests/test_system_info.py
index bec606c44..4aec13c82 100644
--- a/numpy/distutils/tests/test_system_info.py
+++ b/numpy/distutils/tests/test_system_info.py
@@ -8,9 +8,7 @@ from subprocess import Popen, PIPE
 from distutils.errors import DistutilsError
 
 from numpy.distutils import ccompiler, customized_ccompiler
-from numpy.testing import (
-    run_module_suite, assert_, assert_equal
-    )
+from numpy.testing import assert_, assert_equal
 from numpy.distutils.system_info import system_info, ConfigParser
 from numpy.distutils.system_info import default_lib_dirs, default_include_dirs
 
@@ -235,7 +233,3 @@ class TestSystemInfoReading(object):
             assert_(os.path.isfile(self._src2.replace('.c', '.o')))
         finally:
             os.chdir(previousDir)
-
-
-if __name__ == '__main__':
-    run_module_suite()