From 9ae4f9ba09b794842826f94dfbf966e747a04c68 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 30 Jul 2022 19:00:38 -0400 Subject: [PATCH] Remove unittest cruft --- distutils/tests/test_archive_util.py | 10 +--------- distutils/tests/test_bdist.py | 9 --------- distutils/tests/test_bdist_dumb.py | 9 --------- distutils/tests/test_bdist_msi.py | 9 --------- distutils/tests/test_bdist_rpm.py | 9 --------- distutils/tests/test_bdist_wininst.py | 9 --------- distutils/tests/test_build.py | 9 --------- distutils/tests/test_build_clib.py | 10 +--------- distutils/tests/test_build_ext.py | 11 ----------- distutils/tests/test_build_py.py | 9 --------- distutils/tests/test_build_scripts.py | 9 --------- distutils/tests/test_check.py | 9 --------- distutils/tests/test_clean.py | 9 --------- distutils/tests/test_cmd.py | 10 +--------- distutils/tests/test_config.py | 9 --------- distutils/tests/test_config_cmd.py | 10 +--------- distutils/tests/test_core.py | 10 +--------- distutils/tests/test_cygwinccompiler.py | 9 --------- distutils/tests/test_dep_util.py | 9 --------- distutils/tests/test_dir_util.py | 9 --------- distutils/tests/test_dist.py | 13 +------------ distutils/tests/test_extension.py | 9 --------- distutils/tests/test_file_util.py | 9 --------- distutils/tests/test_filelist.py | 15 +-------------- distutils/tests/test_install.py | 10 +--------- distutils/tests/test_install_data.py | 9 --------- distutils/tests/test_install_headers.py | 9 --------- distutils/tests/test_install_lib.py | 9 --------- distutils/tests/test_install_scripts.py | 9 --------- distutils/tests/test_log.py | 10 +--------- distutils/tests/test_msvc9compiler.py | 9 --------- distutils/tests/test_msvccompiler.py | 9 --------- distutils/tests/test_register.py | 9 --------- distutils/tests/test_sdist.py | 10 +--------- distutils/tests/test_spawn.py | 10 +--------- distutils/tests/test_sysconfig.py | 12 +----------- distutils/tests/test_text_file.py | 9 --------- distutils/tests/test_unixccompiler.py | 9 --------- distutils/tests/test_upload.py | 10 ---------- distutils/tests/test_util.py | 9 --------- distutils/tests/test_version.py | 9 --------- distutils/tests/test_versionpredicate.py | 15 --------------- 42 files changed, 12 insertions(+), 397 deletions(-) diff --git a/distutils/tests/test_archive_util.py b/distutils/tests/test_archive_util.py index 8fb95744..581bc606 100644 --- a/distutils/tests/test_archive_util.py +++ b/distutils/tests/test_archive_util.py @@ -17,7 +17,7 @@ ) from distutils.spawn import find_executable, spawn from distutils.tests import support -from test.support import run_unittest, patch +from test.support import patch from .unix_compat import require_unix_id, require_uid_0, grp, pwd, UID_0_SUPPORT from .py38compat import change_cwd @@ -411,11 +411,3 @@ def test_tarfile_root_owner(self): self.assertEqual(member.gid, 0) finally: archive.close() - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(ArchiveUtilTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_bdist.py b/distutils/tests/test_bdist.py index 2d0bb95b..7686ef5e 100644 --- a/distutils/tests/test_bdist.py +++ b/distutils/tests/test_bdist.py @@ -1,7 +1,6 @@ """Tests for distutils.command.bdist.""" import os import unittest -from test.support import run_unittest import warnings from distutils.command.bdist import bdist @@ -60,11 +59,3 @@ def test_skip_build(self): self.assertTrue( subcmd.skip_build, '%s should take --skip-build from bdist' % name ) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(BuildTestCase) - - -if __name__ == '__main__': - run_unittest(test_suite()) diff --git a/distutils/tests/test_bdist_dumb.py b/distutils/tests/test_bdist_dumb.py index 83ab217d..14b1363c 100644 --- a/distutils/tests/test_bdist_dumb.py +++ b/distutils/tests/test_bdist_dumb.py @@ -4,7 +4,6 @@ import sys import zipfile import unittest -from test.support import run_unittest from distutils.core import Distribution from distutils.command.bdist_dumb import bdist_dumb @@ -97,11 +96,3 @@ def test_simple_built(self): if not sys.dont_write_bytecode: wanted.append('foo.%s.pyc' % sys.implementation.cache_tag) self.assertEqual(contents, sorted(wanted)) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(BuildDumbTestCase) - - -if __name__ == '__main__': - run_unittest(test_suite()) diff --git a/distutils/tests/test_bdist_msi.py b/distutils/tests/test_bdist_msi.py index a9f3dbb5..3bfb7df1 100644 --- a/distutils/tests/test_bdist_msi.py +++ b/distutils/tests/test_bdist_msi.py @@ -1,7 +1,6 @@ """Tests for distutils.command.bdist_msi.""" import sys import unittest -from test.support import run_unittest from distutils.tests import support from .py38compat import check_warnings @@ -19,11 +18,3 @@ def test_minimal(self): with check_warnings(("", DeprecationWarning)): cmd = bdist_msi(dist) cmd.ensure_finalized() - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(BDistMSITestCase) - - -if __name__ == '__main__': - run_unittest(test_suite()) diff --git a/distutils/tests/test_bdist_rpm.py b/distutils/tests/test_bdist_rpm.py index f60a582a..b18d5ce3 100644 --- a/distutils/tests/test_bdist_rpm.py +++ b/distutils/tests/test_bdist_rpm.py @@ -3,7 +3,6 @@ import unittest import sys import os -from test.support import run_unittest from distutils.core import Distribution from distutils.command.bdist_rpm import bdist_rpm @@ -150,11 +149,3 @@ def test_no_optimize_flag(self): ) os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm')) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(BuildRpmTestCase) - - -if __name__ == '__main__': - run_unittest(test_suite()) diff --git a/distutils/tests/test_bdist_wininst.py b/distutils/tests/test_bdist_wininst.py index c103a63b..4e4fcc5b 100644 --- a/distutils/tests/test_bdist_wininst.py +++ b/distutils/tests/test_bdist_wininst.py @@ -2,7 +2,6 @@ import sys import platform import unittest -from test.support import run_unittest from .py38compat import check_warnings @@ -36,11 +35,3 @@ def test_get_exe_bytes(self): # no matter what platform we have exe_file = cmd.get_exe_bytes() self.assertGreater(len(exe_file), 10) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(BuildWinInstTestCase) - - -if __name__ == '__main__': - run_unittest(test_suite()) diff --git a/distutils/tests/test_build.py b/distutils/tests/test_build.py index 190bbdfd..712b0d53 100644 --- a/distutils/tests/test_build.py +++ b/distutils/tests/test_build.py @@ -2,7 +2,6 @@ import unittest import os import sys -from test.support import run_unittest from distutils.command.build import build from distutils.tests import support @@ -45,11 +44,3 @@ def test_finalize_options(self): # executable is os.path.normpath(sys.executable) self.assertEqual(cmd.executable, os.path.normpath(sys.executable)) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(BuildTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_build_clib.py b/distutils/tests/test_build_clib.py index 24c74787..c8fbb5c2 100644 --- a/distutils/tests/test_build_clib.py +++ b/distutils/tests/test_build_clib.py @@ -3,7 +3,7 @@ import os import sys -from test.support import run_unittest, missing_compiler_executable +from test.support import missing_compiler_executable from distutils.command.build_clib import build_clib from distutils.errors import DistutilsSetupError @@ -134,11 +134,3 @@ def test_run(self): # let's check the result self.assertIn('libfoo.a', os.listdir(build_temp)) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(BuildCLibTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_build_ext.py b/distutils/tests/test_build_ext.py index c42ceabd..ef2cb1ee 100644 --- a/distutils/tests/test_build_ext.py +++ b/distutils/tests/test_build_ext.py @@ -559,14 +559,3 @@ def build_ext(self, *args, **kwargs): build_ext = super().build_ext(*args, **kwargs) build_ext.parallel = True return build_ext - - -def test_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.TestLoader().loadTestsFromTestCase(BuildExtTestCase)) - suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ParallelBuildExtTestCase)) - return suite - - -if __name__ == '__main__': - support.run_unittest(__name__) diff --git a/distutils/tests/test_build_py.py b/distutils/tests/test_build_py.py index eb01d81a..4a8582e4 100644 --- a/distutils/tests/test_build_py.py +++ b/distutils/tests/test_build_py.py @@ -10,7 +10,6 @@ from unittest.mock import patch from distutils.tests import support -from test.support import run_unittest class BuildPyTestCase( @@ -208,11 +207,3 @@ def _trap(msg, *args): cmd.run() # Test should complete successfully with no exception - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(BuildPyTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_build_scripts.py b/distutils/tests/test_build_scripts.py index 8c7061d7..6ef9dd61 100644 --- a/distutils/tests/test_build_scripts.py +++ b/distutils/tests/test_build_scripts.py @@ -8,7 +8,6 @@ from distutils import sysconfig from distutils.tests import support -from test.support import run_unittest class BuildScriptsTestCase( @@ -108,11 +107,3 @@ def test_version_int(self): built = os.listdir(target) for name in expected: self.assertIn(name, built) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(BuildScriptsTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_check.py b/distutils/tests/test_check.py index 424c5e08..279fbe56 100644 --- a/distutils/tests/test_check.py +++ b/distutils/tests/test_check.py @@ -2,7 +2,6 @@ import os import textwrap import unittest -from test.support import run_unittest from distutils.command.check import check, HAS_DOCUTILS from distutils.tests import support @@ -199,11 +198,3 @@ def test_check_all(self): self.assertRaises( DistutilsSetupError, self._run, {}, **{'strict': 1, 'restructuredtext': 1} ) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(CheckTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_clean.py b/distutils/tests/test_clean.py index 92e58f78..796ca0fc 100644 --- a/distutils/tests/test_clean.py +++ b/distutils/tests/test_clean.py @@ -4,7 +4,6 @@ from distutils.command.clean import clean from distutils.tests import support -from test.support import run_unittest class cleanTestCase(support.TempdirManager, support.LoggingSilencer, unittest.TestCase): @@ -45,11 +44,3 @@ def test_simple_run(self): cmd.all = 1 cmd.ensure_finalized() cmd.run() - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(cleanTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_cmd.py b/distutils/tests/test_cmd.py index 12a8a20c..6a771a11 100644 --- a/distutils/tests/test_cmd.py +++ b/distutils/tests/test_cmd.py @@ -1,7 +1,7 @@ """Tests for distutils.cmd.""" import unittest import os -from test.support import captured_stdout, run_unittest +from test.support import captured_stdout from distutils.cmd import Command from distutils.dist import Distribution @@ -122,11 +122,3 @@ def test_debug_print(self): self.assertEqual(stdout.read(), 'xxx\n') finally: debug.DEBUG = False - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(CommandTestCase) - - -if __name__ == '__main__': - run_unittest(test_suite()) diff --git a/distutils/tests/test_config.py b/distutils/tests/test_config.py index a4b48509..a28c5a99 100644 --- a/distutils/tests/test_config.py +++ b/distutils/tests/test_config.py @@ -8,7 +8,6 @@ from distutils.log import WARN from distutils.tests import support -from test.support import run_unittest PYPIRC = """\ [distutils] @@ -146,11 +145,3 @@ def test_config_interpolation(self): ('username', 'cbiggles'), ] self.assertEqual(config, waited) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(PyPIRCCommandTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_config_cmd.py b/distutils/tests/test_config_cmd.py index 0c1a9d25..3c0879b5 100644 --- a/distutils/tests/test_config_cmd.py +++ b/distutils/tests/test_config_cmd.py @@ -2,7 +2,7 @@ import unittest import os import sys -from test.support import run_unittest, missing_compiler_executable +from test.support import missing_compiler_executable from distutils.command.config import dump_file, config from distutils.tests import support @@ -90,11 +90,3 @@ def test_clean(self): for f in (f1, f2): self.assertFalse(os.path.exists(f)) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(ConfigTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_core.py b/distutils/tests/test_core.py index 23402fb8..44bf6def 100644 --- a/distutils/tests/test_core.py +++ b/distutils/tests/test_core.py @@ -5,7 +5,7 @@ import os import shutil import sys -from test.support import captured_stdout, run_unittest +from test.support import captured_stdout from . import py38compat as os_helper import unittest from distutils.tests import support @@ -155,11 +155,3 @@ def test_debug_mode(self): stdout.seek(0) wanted = "options (after parsing config files):\n" self.assertEqual(stdout.readlines()[0], wanted) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(CoreTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_cygwinccompiler.py b/distutils/tests/test_cygwinccompiler.py index 7760436a..cb09a43f 100644 --- a/distutils/tests/test_cygwinccompiler.py +++ b/distutils/tests/test_cygwinccompiler.py @@ -2,7 +2,6 @@ import unittest import sys import os -from test.support import run_unittest from distutils.cygwinccompiler import ( check_config_h, @@ -120,11 +119,3 @@ def test_get_msvcr(self): '2.5.1 (r251:54863, Apr 18 2007, 08:51:08) ' '[MSC v.2000 32 bits (Intel)]' ) self.assertRaises(ValueError, get_msvcr) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(CygwinCCompilerTestCase) - - -if __name__ == '__main__': - run_unittest(test_suite()) diff --git a/distutils/tests/test_dep_util.py b/distutils/tests/test_dep_util.py index 89ae05d1..fb170c6f 100644 --- a/distutils/tests/test_dep_util.py +++ b/distutils/tests/test_dep_util.py @@ -5,7 +5,6 @@ from distutils.dep_util import newer, newer_pairwise, newer_group from distutils.errors import DistutilsFileError from distutils.tests import support -from test.support import run_unittest class DepUtilTestCase(support.TempdirManager, unittest.TestCase): @@ -68,11 +67,3 @@ def test_newer_group(self): self.assertFalse(newer_group([one, two, old_file], three, missing='ignore')) self.assertTrue(newer_group([one, two, old_file], three, missing='newer')) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(DepUtilTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_dir_util.py b/distutils/tests/test_dir_util.py index a1f9a240..8231df69 100644 --- a/distutils/tests/test_dir_util.py +++ b/distutils/tests/test_dir_util.py @@ -16,7 +16,6 @@ from distutils import log from distutils.tests import support -from test.support import run_unittest class DirUtilTestCase(support.TempdirManager, unittest.TestCase): @@ -134,11 +133,3 @@ def test_copy_tree_exception_in_listdir(self): ): src = self.tempdirs[-1] dir_util.copy_tree(src, None) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(DirUtilTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_dist.py b/distutils/tests/test_dist.py index 6520a46d..e7474908 100644 --- a/distutils/tests/test_dist.py +++ b/distutils/tests/test_dist.py @@ -11,7 +11,7 @@ from distutils.dist import Distribution, fix_help_options from distutils.cmd import Command -from test.support import captured_stdout, captured_stderr, run_unittest +from test.support import captured_stdout, captured_stderr from .py38compat import TESTFN from distutils.tests import support from distutils import log @@ -552,14 +552,3 @@ def test_read_metadata(self): self.assertEqual(metadata.platforms, None) self.assertEqual(metadata.obsoletes, None) self.assertEqual(metadata.requires, ['foo']) - - -def test_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.TestLoader().loadTestsFromTestCase(DistributionTestCase)) - suite.addTest(unittest.TestLoader().loadTestsFromTestCase(MetadataTestCase)) - return suite - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_extension.py b/distutils/tests/test_extension.py index 77fe3f82..bf573930 100644 --- a/distutils/tests/test_extension.py +++ b/distutils/tests/test_extension.py @@ -3,7 +3,6 @@ import os import warnings -from test.support import run_unittest from distutils.extension import read_setup_file, Extension from .py38compat import check_warnings @@ -102,11 +101,3 @@ def test_extension_init(self): self.assertEqual( str(w.warnings[0].message), "Unknown Extension options: 'chic'" ) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(ExtensionTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_file_util.py b/distutils/tests/test_file_util.py index 22898b95..6b333d5e 100644 --- a/distutils/tests/test_file_util.py +++ b/distutils/tests/test_file_util.py @@ -8,7 +8,6 @@ from distutils import log from distutils.tests import support from distutils.errors import DistutilsFileError -from test.support import run_unittest from .py38compat import unlink @@ -115,11 +114,3 @@ def test_copy_file_hard_link_failure(self): for fn in (self.source, self.target): with open(fn, 'r') as f: self.assertEqual(f.read(), 'some content') - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(FileUtilTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_filelist.py b/distutils/tests/test_filelist.py index 71718a86..0673139e 100644 --- a/distutils/tests/test_filelist.py +++ b/distutils/tests/test_filelist.py @@ -8,7 +8,7 @@ from distutils.filelist import glob_to_re, translate_pattern, FileList from distutils import filelist -from test.support import captured_stdout, run_unittest +from test.support import captured_stdout from distutils.tests import support from . import py38compat as os_helper @@ -349,16 +349,3 @@ def test_symlink_loop(self): os.symlink('.', link) files = filelist.findall(temp_dir) assert len(files) == 1 - - -def test_suite(): - return unittest.TestSuite( - [ - unittest.TestLoader().loadTestsFromTestCase(FileListTestCase), - unittest.TestLoader().loadTestsFromTestCase(FindAllTestCase), - ] - ) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_install.py b/distutils/tests/test_install.py index 5f0a64db..38c758b5 100644 --- a/distutils/tests/test_install.py +++ b/distutils/tests/test_install.py @@ -5,7 +5,7 @@ import unittest import site -from test.support import captured_stdout, run_unittest +from test.support import captured_stdout from distutils import sysconfig from distutils.command.install import install @@ -272,11 +272,3 @@ def test_debug_mode(self): finally: install_module.DEBUG = False self.assertGreater(len(self.logs), old_logs_len) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(InstallTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_install_data.py b/distutils/tests/test_install_data.py index a08168b2..cb5ddb18 100644 --- a/distutils/tests/test_install_data.py +++ b/distutils/tests/test_install_data.py @@ -4,7 +4,6 @@ from distutils.command.install_data import install_data from distutils.tests import support -from test.support import run_unittest class InstallDataTestCase( @@ -67,11 +66,3 @@ def test_simple_run(self): self.assertEqual(len(cmd.get_outputs()), 4) self.assertTrue(os.path.exists(os.path.join(inst2, rtwo))) self.assertTrue(os.path.exists(os.path.join(inst, rone))) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(InstallDataTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_install_headers.py b/distutils/tests/test_install_headers.py index db4f4dbb..7a0ad934 100644 --- a/distutils/tests/test_install_headers.py +++ b/distutils/tests/test_install_headers.py @@ -4,7 +4,6 @@ from distutils.command.install_headers import install_headers from distutils.tests import support -from test.support import run_unittest class InstallHeadersTestCase( @@ -33,11 +32,3 @@ def test_simple_run(self): # let's check the results self.assertEqual(len(cmd.get_outputs()), 2) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(InstallHeadersTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_install_lib.py b/distutils/tests/test_install_lib.py index 1ef233a7..6ef416cd 100644 --- a/distutils/tests/test_install_lib.py +++ b/distutils/tests/test_install_lib.py @@ -8,7 +8,6 @@ from distutils.extension import Extension from distutils.tests import support from distutils.errors import DistutilsOptionError -from test.support import run_unittest class InstallLibTestCase( @@ -107,11 +106,3 @@ def test_dont_write_bytecode(self): sys.dont_write_bytecode = old_dont_write_bytecode self.assertIn('byte-compiling is disabled', self.logs[0][1] % self.logs[0][2]) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(InstallLibTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_install_scripts.py b/distutils/tests/test_install_scripts.py index bac78801..2b19d736 100644 --- a/distutils/tests/test_install_scripts.py +++ b/distutils/tests/test_install_scripts.py @@ -7,7 +7,6 @@ from distutils.core import Distribution from distutils.tests import support -from test.support import run_unittest class InstallScriptsTestCase( @@ -77,11 +76,3 @@ def write_script(name, text): installed = os.listdir(target) for name in expected: self.assertIn(name, installed) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(InstallScriptsTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_log.py b/distutils/tests/test_log.py index 33f7f96c..4a5c5a05 100644 --- a/distutils/tests/test_log.py +++ b/distutils/tests/test_log.py @@ -3,7 +3,7 @@ import io import sys import unittest -from test.support import swap_attr, run_unittest +from test.support import swap_attr from distutils import log @@ -51,11 +51,3 @@ def test_non_ascii(self): if errors == 'ignore' else 'Fαtal\t\\xc8rr\\u014dr', ) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(TestLog) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_msvc9compiler.py b/distutils/tests/test_msvc9compiler.py index ec4781af..11a45557 100644 --- a/distutils/tests/test_msvc9compiler.py +++ b/distutils/tests/test_msvc9compiler.py @@ -5,7 +5,6 @@ from distutils.errors import DistutilsPlatformError from distutils.tests import support -from test.support import run_unittest # A manifest with the only assembly reference being the msvcrt assembly, so # should have the assembly completely stripped. Note that although the @@ -182,11 +181,3 @@ def test_remove_entire_manifest(self): compiler = MSVCCompiler() got = compiler._remove_visual_c_ref(manifest) self.assertIsNone(got) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(msvc9compilerTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_msvccompiler.py b/distutils/tests/test_msvccompiler.py index 3179dbf4..9357a223 100644 --- a/distutils/tests/test_msvccompiler.py +++ b/distutils/tests/test_msvccompiler.py @@ -3,7 +3,6 @@ import unittest import os import threading -from test.support import run_unittest import pytest @@ -124,11 +123,3 @@ def CCompiler_spawn(self, cmd): compiler.spawn(["n/a"]) assert os.environ.get("PATH") != "expected" - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(msvccompilerTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_register.py b/distutils/tests/test_register.py index 0f91ad36..76fec685 100644 --- a/distutils/tests/test_register.py +++ b/distutils/tests/test_register.py @@ -5,7 +5,6 @@ import urllib import warnings -from test.support import run_unittest from .py38compat import check_warnings @@ -338,11 +337,3 @@ def test_show_response(self): results = self.get_logs(INFO) self.assertEqual(results[3], 75 * '-' + '\nxxx\n' + 75 * '-') - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(RegisterTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_sdist.py b/distutils/tests/test_sdist.py index 3a6aea23..262d9571 100644 --- a/distutils/tests/test_sdist.py +++ b/distutils/tests/test_sdist.py @@ -6,7 +6,7 @@ import zipfile from os.path import join from textwrap import dedent -from test.support import captured_stdout, run_unittest +from test.support import captured_stdout from .unix_compat import require_unix_id, require_uid_0, pwd, grp from .py38compat import check_warnings @@ -511,11 +511,3 @@ def test_make_distribution_owner_group(self): self.assertEqual(member.uid, os.getuid()) finally: archive.close() - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(SDistTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_spawn.py b/distutils/tests/test_spawn.py index a7732562..b86c157f 100644 --- a/distutils/tests/test_spawn.py +++ b/distutils/tests/test_spawn.py @@ -3,7 +3,7 @@ import stat import sys import unittest.mock -from test.support import run_unittest, unix_shell +from test.support import unix_shell from . import py38compat as os_helper @@ -123,11 +123,3 @@ def test_spawn_missing_exe(self): with self.assertRaises(DistutilsExecError) as ctx: spawn(['does-not-exist']) self.assertIn("command 'does-not-exist' failed", str(ctx.exception)) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(SpawnTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_sysconfig.py b/distutils/tests/test_sysconfig.py index a033e075..7d6ea14d 100644 --- a/distutils/tests/test_sysconfig.py +++ b/distutils/tests/test_sysconfig.py @@ -14,7 +14,7 @@ from distutils.ccompiler import get_default_compiler from distutils.unixccompiler import UnixCCompiler from distutils.tests import support -from test.support import run_unittest, swap_item +from test.support import swap_item from .py38compat import TESTFN @@ -331,13 +331,3 @@ def test_win_build_venv_from_source_tree(self): cmd, env={**os.environ, "PYTHONPATH": distutils_path} ) assert out == "True" - - -def test_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.TestLoader().loadTestsFromTestCase(SysconfigTestCase)) - return suite - - -if __name__ == '__main__': - run_unittest(test_suite()) diff --git a/distutils/tests/test_text_file.py b/distutils/tests/test_text_file.py index 16de9caa..ad10b6d5 100644 --- a/distutils/tests/test_text_file.py +++ b/distutils/tests/test_text_file.py @@ -3,7 +3,6 @@ import unittest from distutils.text_file import TextFile from distutils.tests import support -from test.support import run_unittest TEST_DATA = """# test file @@ -112,11 +111,3 @@ def test_input(count, description, file, expected_result): test_input(6, "join lines with collapsing", in_file, result6) finally: in_file.close() - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(TextFileTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_unixccompiler.py b/distutils/tests/test_unixccompiler.py index 879769fc..76bef863 100644 --- a/distutils/tests/test_unixccompiler.py +++ b/distutils/tests/test_unixccompiler.py @@ -2,7 +2,6 @@ import os import sys import unittest -from test.support import run_unittest from unittest.mock import patch from .py38compat import EnvironmentVarGuard @@ -307,11 +306,3 @@ def test_has_function(self): self.cc.output_dir = 'scratch' os.chdir(self.mkdtemp()) self.cc.has_function('abort', includes=['stdlib.h']) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(UnixCCompilerTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_upload.py b/distutils/tests/test_upload.py index afba2fae..a1d37306 100644 --- a/distutils/tests/test_upload.py +++ b/distutils/tests/test_upload.py @@ -1,10 +1,8 @@ """Tests for distutils.command.upload.""" import os -import unittest import unittest.mock as mock from urllib.request import HTTPError -from test.support import run_unittest from distutils.command import upload as upload_mod from distutils.command.upload import upload @@ -219,11 +217,3 @@ def test_wrong_exception_order(self): results = self.get_logs(ERROR) self.assertIn(expected, results[-1]) self.clear_logs() - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(uploadTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_util.py b/distutils/tests/test_util.py index cebd61cc..cd15dc07 100644 --- a/distutils/tests/test_util.py +++ b/distutils/tests/test_util.py @@ -4,7 +4,6 @@ import unittest import sysconfig as stdlib_sysconfig from copy import copy -from test.support import run_unittest from unittest import mock from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError @@ -237,11 +236,3 @@ def test_grok_environment_error(self): exc = IOError("Unable to find batch file") msg = grok_environment_error(exc) self.assertEqual(msg, "error: Unable to find batch file") - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(UtilTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_version.py b/distutils/tests/test_version.py index cecb279f..3727bac8 100644 --- a/distutils/tests/test_version.py +++ b/distutils/tests/test_version.py @@ -3,7 +3,6 @@ import distutils from distutils.version import LooseVersion from distutils.version import StrictVersion -from test.support import run_unittest class VersionTestCase(unittest.TestCase): @@ -93,11 +92,3 @@ def test_cmp(self): NotImplemented, 'cmp(%s, %s) should be NotImplemented, got %s' % (v1, v2, res), ) - - -def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(VersionTestCase) - - -if __name__ == "__main__": - run_unittest(test_suite()) diff --git a/distutils/tests/test_versionpredicate.py b/distutils/tests/test_versionpredicate.py index ce3d0f46..e69de29b 100644 --- a/distutils/tests/test_versionpredicate.py +++ b/distutils/tests/test_versionpredicate.py @@ -1,15 +0,0 @@ -"""Tests harness for distutils.versionpredicate. - -""" - -import distutils.versionpredicate -import doctest -from test.support import run_unittest - - -def test_suite(): - return doctest.DocTestSuite(distutils.versionpredicate) - - -if __name__ == '__main__': - run_unittest(test_suite())