GeezerVison is showing github.com — bpo-5846: Do not use obsolete unittest functions. by serhiy-storchaka · Pull Request #28303 · python/cpython
bpo-5846: Do not use obsolete unittest functions.
#28303
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement . We’ll occasionally send you account related emails.
Already on GitHub?
Sign in
to your account
Uh oh!
There was an error while loading. Please reload this page.
Show file tree
Hide file tree
Changes from all commits
Commits
File filter
Filter by extension
.py
(49)
All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Hide whitespace
Diff view
Hide whitespace
There are no files selected for viewing
Original file line number
Diff line number
Diff line change
Expand Up
@@ -390,7 +390,7 @@ def test_tarfile_root_owner(self):
archive.close()
def test_suite():
return unittest.makeSuite (ArchiveUtilTestCase)
return unittest.TestLoader().loadTestsFromTestCase (ArchiveUtilTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -45,7 +45,7 @@ def test_skip_build(self):
def test_suite():
return unittest.makeSuite (BuildTestCase)
return unittest.TestLoader().loadTestsFromTestCase (BuildTestCase)
if __name__ == '__main__':
Expand Down
Original file line number
Diff line number
Diff line change
Expand Up
@@ -91,7 +91,7 @@ def test_simple_built(self):
self.assertEqual(contents, sorted(wanted))
def test_suite():
return unittest.makeSuite (BuildDumbTestCase)
return unittest.TestLoader().loadTestsFromTestCase (BuildDumbTestCase)
if __name__ == '__main__':
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -129,7 +129,7 @@ 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.makeSuite (BuildRpmTestCase)
return unittest.TestLoader().loadTestsFromTestCase (BuildRpmTestCase)
if __name__ == '__main__':
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -50,7 +50,7 @@ def test_finalize_options(self):
self.assertEqual(cmd.executable, os.path.normpath(sys.executable))
def test_suite():
return unittest.makeSuite (BuildTestCase)
return unittest.TestLoader().loadTestsFromTestCase (BuildTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -138,7 +138,7 @@ def test_run(self):
self.assertIn('libfoo.a', os.listdir(build_temp))
def test_suite():
return unittest.makeSuite (BuildCLibTestCase)
return unittest.TestLoader().loadTestsFromTestCase (BuildCLibTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -545,8 +545,8 @@ def build_ext(self, *args, **kwargs):
def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite (BuildExtTestCase))
suite.addTest(unittest.makeSuite (ParallelBuildExtTestCase))
suite.addTest(unittest.TestLoader().loadTestsFromTestCase (BuildExtTestCase))
suite.addTest(unittest.TestLoader().loadTestsFromTestCase (ParallelBuildExtTestCase))
return suite
if __name__ == '__main__':
Expand Down
Original file line number
Diff line number
Diff line change
Expand Up
@@ -173,7 +173,7 @@ def test_dont_write_bytecode(self):
def test_suite():
return unittest.makeSuite (BuildPyTestCase)
return unittest.TestLoader().loadTestsFromTestCase (BuildPyTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -106,7 +106,7 @@ def test_version_int(self):
self.assertIn(name, built)
def test_suite():
return unittest.makeSuite (BuildScriptsTestCase)
return unittest.TestLoader().loadTestsFromTestCase (BuildScriptsTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -157,7 +157,7 @@ def test_check_all(self):
'restructuredtext': 1})
def test_suite():
return unittest.makeSuite (CheckTestCase)
return unittest.TestLoader().loadTestsFromTestCase (CheckTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -43,7 +43,7 @@ def test_simple_run(self):
cmd.run()
def test_suite():
return unittest.makeSuite (cleanTestCase)
return unittest.TestLoader().loadTestsFromTestCase (cleanTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -120,7 +120,7 @@ def test_debug_print(self):
debug.DEBUG = False
def test_suite():
return unittest.makeSuite (CommandTestCase)
return unittest.TestLoader().loadTestsFromTestCase (CommandTestCase)
if __name__ == '__main__':
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -135,7 +135,7 @@ def test_config_interpolation(self):
def test_suite():
return unittest.makeSuite (PyPIRCCommandTestCase)
return unittest.TestLoader().loadTestsFromTestCase (PyPIRCCommandTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -94,7 +94,7 @@ def test_clean(self):
self.assertFalse(os.path.exists(f))
def test_suite():
return unittest.makeSuite (ConfigTestCase)
return unittest.TestLoader().loadTestsFromTestCase (ConfigTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -134,7 +134,7 @@ def test_debug_mode(self):
self.assertEqual(stdout.readlines()[0], wanted)
def test_suite():
return unittest.makeSuite (CoreTestCase)
return unittest.TestLoader().loadTestsFromTestCase (CoreTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -148,7 +148,7 @@ def test_get_msvcr(self):
self.assertRaises(ValueError, get_msvcr)
def test_suite():
return unittest.makeSuite (CygwinCCompilerTestCase)
return unittest.TestLoader().loadTestsFromTestCase (CygwinCCompilerTestCase)
if __name__ == '__main__':
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -74,7 +74,7 @@ def test_newer_group(self):
def test_suite():
return unittest.makeSuite (DepUtilTestCase)
return unittest.TestLoader().loadTestsFromTestCase (DepUtilTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -133,7 +133,7 @@ def test_copy_tree_exception_in_listdir(self):
def test_suite():
return unittest.makeSuite (DirUtilTestCase)
return unittest.TestLoader().loadTestsFromTestCase (DirUtilTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -521,8 +521,8 @@ def test_read_metadata(self):
def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite (DistributionTestCase))
suite.addTest(unittest.makeSuite (MetadataTestCase))
suite.addTest(unittest.TestLoader().loadTestsFromTestCase (DistributionTestCase))
suite.addTest(unittest.TestLoader().loadTestsFromTestCase (MetadataTestCase))
return suite
if __name__ == "__main__":
Expand Down
Original file line number
Diff line number
Diff line change
Expand Up
@@ -64,7 +64,7 @@ def test_extension_init(self):
"Unknown Extension options: 'chic'")
def test_suite():
return unittest.makeSuite (ExtensionTestCase)
return unittest.TestLoader().loadTestsFromTestCase (ExtensionTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -118,7 +118,7 @@ def test_copy_file_hard_link_failure(self):
def test_suite():
return unittest.makeSuite (FileUtilTestCase)
return unittest.TestLoader().loadTestsFromTestCase (FileUtilTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -331,8 +331,8 @@ def test_non_local_discovery(self):
def test_suite():
return unittest.TestSuite([
unittest.makeSuite (FileListTestCase),
unittest.makeSuite (FindAllTestCase),
unittest.TestLoader().loadTestsFromTestCase (FileListTestCase),
unittest.TestLoader().loadTestsFromTestCase (FindAllTestCase),
])
Expand Down
Original file line number
Diff line number
Diff line change
Expand Up
@@ -254,7 +254,7 @@ def test_debug_mode(self):
def test_suite():
return unittest.makeSuite (InstallTestCase)
return unittest.TestLoader().loadTestsFromTestCase (InstallTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -69,7 +69,7 @@ def test_simple_run(self):
self.assertTrue(os.path.exists(os.path.join(inst, rone)))
def test_suite():
return unittest.makeSuite (InstallDataTestCase)
return unittest.TestLoader().loadTestsFromTestCase (InstallDataTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -33,7 +33,7 @@ def test_simple_run(self):
self.assertEqual(len(cmd.get_outputs()), 2)
def test_suite():
return unittest.makeSuite (InstallHeadersTestCase)
return unittest.TestLoader().loadTestsFromTestCase (InstallHeadersTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -109,7 +109,7 @@ def test_dont_write_bytecode(self):
def test_suite():
return unittest.makeSuite (InstallLibTestCase)
return unittest.TestLoader().loadTestsFromTestCase (InstallLibTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -76,7 +76,7 @@ def write_script(name, text):
def test_suite():
return unittest.makeSuite (InstallScriptsTestCase)
return unittest.TestLoader().loadTestsFromTestCase (InstallScriptsTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -40,7 +40,7 @@ def test_non_ascii(self):
'Fαtal\t\\xc8rr\\u014dr')
def test_suite():
return unittest.makeSuite (TestLog)
return unittest.TestLoader().loadTestsFromTestCase (TestLog)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -178,7 +178,7 @@ def test_remove_entire_manifest(self):
def test_suite():
return unittest.makeSuite (msvc9compilerTestCase)
return unittest.TestLoader().loadTestsFromTestCase (msvc9compilerTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -75,7 +75,7 @@ def test_get_vc2015(self):
raise unittest.SkipTest("VS 2015 is not installed")
def test_suite():
return unittest.makeSuite (msvccompilerTestCase)
return unittest.TestLoader().loadTestsFromTestCase (msvccompilerTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -318,7 +318,7 @@ def test_show_response(self):
def test_suite():
return unittest.makeSuite (RegisterTestCase)
return unittest.TestLoader().loadTestsFromTestCase (RegisterTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -487,7 +487,7 @@ def test_make_distribution_owner_group(self):
archive.close()
def test_suite():
return unittest.makeSuite (SDistTestCase)
return unittest.TestLoader().loadTestsFromTestCase (SDistTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -131,7 +131,7 @@ def test_spawn_missing_exe(self):
def test_suite():
return unittest.makeSuite (SpawnTestCase)
return unittest.TestLoader().loadTestsFromTestCase (SpawnTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -269,7 +269,7 @@ def test_customize_compiler_before_get_config_vars(self):
def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite (SysconfigTestCase))
suite.addTest(unittest.TestLoader().loadTestsFromTestCase (SysconfigTestCase))
return suite
Expand Down
Original file line number
Diff line number
Diff line change
Expand Up
@@ -101,7 +101,7 @@ def test_input(count, description, file, expected_result):
in_file.close()
def test_suite():
return unittest.makeSuite (TextFileTestCase)
return unittest.TestLoader().loadTestsFromTestCase (TextFileTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -139,7 +139,7 @@ def gcv(v):
def test_suite():
return unittest.makeSuite (UnixCCompilerTestCase)
return unittest.TestLoader().loadTestsFromTestCase (UnixCCompilerTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -217,7 +217,7 @@ def test_wrong_exception_order(self):
def test_suite():
return unittest.makeSuite (uploadTestCase)
return unittest.TestLoader().loadTestsFromTestCase (uploadTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -304,7 +304,7 @@ def test_grok_environment_error(self):
def test_suite():
return unittest.makeSuite (UtilTestCase)
return unittest.TestLoader().loadTestsFromTestCase (UtilTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -81,7 +81,7 @@ def test_cmp(self):
(v1, v2, res))
def test_suite():
return unittest.makeSuite (VersionTestCase)
return unittest.TestLoader().loadTestsFromTestCase (VersionTestCase)
if __name__ == "__main__":
run_unittest(test_suite())
Original file line number
Diff line number
Diff line change
Expand Up
@@ -1108,17 +1108,18 @@ def match_test_regex(test_id):
def run_unittest(*classes):
"""Run tests from unittest.TestCase-derived classes."""
valid_types = (unittest.TestSuite, unittest.TestCase)
loader = unittest.TestLoader()
suite = unittest.TestSuite()
for cls in classes:
if isinstance(cls, str):
if cls in sys.modules:
suite.addTest(unittest.findTestCases (sys.modules[cls]))
suite.addTest(loader.loadTestsFromModule (sys.modules[cls]))
else:
raise ValueError("str arguments must be keys in sys.modules")
elif isinstance(cls, valid_types):
suite.addTest(cls)
else:
suite.addTest(unittest.makeSuite (cls))
suite.addTest(loader.loadTestsFromTestCase (cls))
_filter_suite(suite, match_test)
_run_suite(suite)
Expand Down
Original file line number
Diff line number
Diff line change
Expand Up
@@ -173,7 +173,7 @@ def test_error(self):
raise RuntimeError('error message')
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite (TestTests))
suite.addTest(unittest.TestLoader().loadTestsFromTestCase (TestTests))
stream = io.StringIO()
runner_cls = get_test_runner_class(sum(a == '-v' for a in sys.argv))
runner = runner_cls(sys.stdout)
Expand Down
Original file line number
Diff line number
Diff line change
Expand Up
@@ -221,9 +221,8 @@ def load_tests(loader, tests, pattern):
classes.append(type("TestCase-" + mod.__name__,
(AnyDBMTestCase, unittest.TestCase),
{'module': mod}))
suites = [unittest.makeSuite(c) for c in classes]
tests.addTests(suites)
for c in classes:
tests.addTest(loader.loadTestsFromTestCase(c))
return tests
if __name__ == "__main__":
Expand Down
Loading
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.