bpo-5846: Do not use obsolete unittest functions. (GH-28303) · python/cpython@851811f (original) (raw)

49 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -390,7 +390,7 @@ def test_tarfile_root_owner(self):
390 390 archive.close()
391 391
392 392 def test_suite():
393 -return unittest.makeSuite(ArchiveUtilTestCase)
393 +return unittest.TestLoader().loadTestsFromTestCase(ArchiveUtilTestCase)
394 394
395 395 if __name__ == "__main__":
396 396 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ def test_skip_build(self):
45 45
46 46
47 47 def test_suite():
48 -return unittest.makeSuite(BuildTestCase)
48 +return unittest.TestLoader().loadTestsFromTestCase(BuildTestCase)
49 49
50 50
51 51 if __name__ == '__main__':
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ def test_simple_built(self):
91 91 self.assertEqual(contents, sorted(wanted))
92 92
93 93 def test_suite():
94 -return unittest.makeSuite(BuildDumbTestCase)
94 +return unittest.TestLoader().loadTestsFromTestCase(BuildDumbTestCase)
95 95
96 96 if __name__ == '__main__':
97 97 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -129,7 +129,7 @@ def test_no_optimize_flag(self):
129 129 os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm'))
130 130
131 131 def test_suite():
132 -return unittest.makeSuite(BuildRpmTestCase)
132 +return unittest.TestLoader().loadTestsFromTestCase(BuildRpmTestCase)
133 133
134 134 if __name__ == '__main__':
135 135 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ def test_finalize_options(self):
50 50 self.assertEqual(cmd.executable, os.path.normpath(sys.executable))
51 51
52 52 def test_suite():
53 -return unittest.makeSuite(BuildTestCase)
53 +return unittest.TestLoader().loadTestsFromTestCase(BuildTestCase)
54 54
55 55 if __name__ == "__main__":
56 56 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -138,7 +138,7 @@ def test_run(self):
138 138 self.assertIn('libfoo.a', os.listdir(build_temp))
139 139
140 140 def test_suite():
141 -return unittest.makeSuite(BuildCLibTestCase)
141 +return unittest.TestLoader().loadTestsFromTestCase(BuildCLibTestCase)
142 142
143 143 if __name__ == "__main__":
144 144 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -545,8 +545,8 @@ def build_ext(self, *args, **kwargs):
545 545
546 546 def test_suite():
547 547 suite = unittest.TestSuite()
548 -suite.addTest(unittest.makeSuite(BuildExtTestCase))
549 -suite.addTest(unittest.makeSuite(ParallelBuildExtTestCase))
548 +suite.addTest(unittest.TestLoader().loadTestsFromTestCase(BuildExtTestCase))
549 +suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ParallelBuildExtTestCase))
550 550 return suite
551 551
552 552 if __name__ == '__main__':
Original file line number Diff line number Diff line change
@@ -173,7 +173,7 @@ def test_dont_write_bytecode(self):
173 173
174 174
175 175 def test_suite():
176 -return unittest.makeSuite(BuildPyTestCase)
176 +return unittest.TestLoader().loadTestsFromTestCase(BuildPyTestCase)
177 177
178 178 if __name__ == "__main__":
179 179 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -106,7 +106,7 @@ def test_version_int(self):
106 106 self.assertIn(name, built)
107 107
108 108 def test_suite():
109 -return unittest.makeSuite(BuildScriptsTestCase)
109 +return unittest.TestLoader().loadTestsFromTestCase(BuildScriptsTestCase)
110 110
111 111 if __name__ == "__main__":
112 112 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -157,7 +157,7 @@ def test_check_all(self):
157 157 'restructuredtext': 1})
158 158
159 159 def test_suite():
160 -return unittest.makeSuite(CheckTestCase)
160 +return unittest.TestLoader().loadTestsFromTestCase(CheckTestCase)
161 161
162 162 if __name__ == "__main__":
163 163 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ def test_simple_run(self):
43 43 cmd.run()
44 44
45 45 def test_suite():
46 -return unittest.makeSuite(cleanTestCase)
46 +return unittest.TestLoader().loadTestsFromTestCase(cleanTestCase)
47 47
48 48 if __name__ == "__main__":
49 49 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@ def test_debug_print(self):
120 120 debug.DEBUG = False
121 121
122 122 def test_suite():
123 -return unittest.makeSuite(CommandTestCase)
123 +return unittest.TestLoader().loadTestsFromTestCase(CommandTestCase)
124 124
125 125 if __name__ == '__main__':
126 126 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -135,7 +135,7 @@ def test_config_interpolation(self):
135 135
136 136
137 137 def test_suite():
138 -return unittest.makeSuite(PyPIRCCommandTestCase)
138 +return unittest.TestLoader().loadTestsFromTestCase(PyPIRCCommandTestCase)
139 139
140 140 if __name__ == "__main__":
141 141 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -94,7 +94,7 @@ def test_clean(self):
94 94 self.assertFalse(os.path.exists(f))
95 95
96 96 def test_suite():
97 -return unittest.makeSuite(ConfigTestCase)
97 +return unittest.TestLoader().loadTestsFromTestCase(ConfigTestCase)
98 98
99 99 if __name__ == "__main__":
100 100 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -134,7 +134,7 @@ def test_debug_mode(self):
134 134 self.assertEqual(stdout.readlines()[0], wanted)
135 135
136 136 def test_suite():
137 -return unittest.makeSuite(CoreTestCase)
137 +return unittest.TestLoader().loadTestsFromTestCase(CoreTestCase)
138 138
139 139 if __name__ == "__main__":
140 140 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -148,7 +148,7 @@ def test_get_msvcr(self):
148 148 self.assertRaises(ValueError, get_msvcr)
149 149
150 150 def test_suite():
151 -return unittest.makeSuite(CygwinCCompilerTestCase)
151 +return unittest.TestLoader().loadTestsFromTestCase(CygwinCCompilerTestCase)
152 152
153 153 if __name__ == '__main__':
154 154 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ def test_newer_group(self):
74 74
75 75
76 76 def test_suite():
77 -return unittest.makeSuite(DepUtilTestCase)
77 +return unittest.TestLoader().loadTestsFromTestCase(DepUtilTestCase)
78 78
79 79 if __name__ == "__main__":
80 80 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -133,7 +133,7 @@ def test_copy_tree_exception_in_listdir(self):
133 133
134 134
135 135 def test_suite():
136 -return unittest.makeSuite(DirUtilTestCase)
136 +return unittest.TestLoader().loadTestsFromTestCase(DirUtilTestCase)
137 137
138 138 if __name__ == "__main__":
139 139 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -521,8 +521,8 @@ def test_read_metadata(self):
521 521
522 522 def test_suite():
523 523 suite = unittest.TestSuite()
524 -suite.addTest(unittest.makeSuite(DistributionTestCase))
525 -suite.addTest(unittest.makeSuite(MetadataTestCase))
524 +suite.addTest(unittest.TestLoader().loadTestsFromTestCase(DistributionTestCase))
525 +suite.addTest(unittest.TestLoader().loadTestsFromTestCase(MetadataTestCase))
526 526 return suite
527 527
528 528 if __name__ == "__main__":
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ def test_extension_init(self):
64 64 "Unknown Extension options: 'chic'")
65 65
66 66 def test_suite():
67 -return unittest.makeSuite(ExtensionTestCase)
67 +return unittest.TestLoader().loadTestsFromTestCase(ExtensionTestCase)
68 68
69 69 if __name__ == "__main__":
70 70 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -118,7 +118,7 @@ def test_copy_file_hard_link_failure(self):
118 118
119 119
120 120 def test_suite():
121 -return unittest.makeSuite(FileUtilTestCase)
121 +return unittest.TestLoader().loadTestsFromTestCase(FileUtilTestCase)
122 122
123 123 if __name__ == "__main__":
124 124 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -331,8 +331,8 @@ def test_non_local_discovery(self):
331 331
332 332 def test_suite():
333 333 return unittest.TestSuite([
334 -unittest.makeSuite(FileListTestCase),
335 -unittest.makeSuite(FindAllTestCase),
334 +unittest.TestLoader().loadTestsFromTestCase(FileListTestCase),
335 +unittest.TestLoader().loadTestsFromTestCase(FindAllTestCase),
336 336 ])
337 337
338 338
Original file line number Diff line number Diff line change
@@ -254,7 +254,7 @@ def test_debug_mode(self):
254 254
255 255
256 256 def test_suite():
257 -return unittest.makeSuite(InstallTestCase)
257 +return unittest.TestLoader().loadTestsFromTestCase(InstallTestCase)
258 258
259 259 if __name__ == "__main__":
260 260 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ def test_simple_run(self):
69 69 self.assertTrue(os.path.exists(os.path.join(inst, rone)))
70 70
71 71 def test_suite():
72 -return unittest.makeSuite(InstallDataTestCase)
72 +return unittest.TestLoader().loadTestsFromTestCase(InstallDataTestCase)
73 73
74 74 if __name__ == "__main__":
75 75 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ def test_simple_run(self):
33 33 self.assertEqual(len(cmd.get_outputs()), 2)
34 34
35 35 def test_suite():
36 -return unittest.makeSuite(InstallHeadersTestCase)
36 +return unittest.TestLoader().loadTestsFromTestCase(InstallHeadersTestCase)
37 37
38 38 if __name__ == "__main__":
39 39 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ def test_dont_write_bytecode(self):
109 109
110 110
111 111 def test_suite():
112 -return unittest.makeSuite(InstallLibTestCase)
112 +return unittest.TestLoader().loadTestsFromTestCase(InstallLibTestCase)
113 113
114 114 if __name__ == "__main__":
115 115 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@ def write_script(name, text):
76 76
77 77
78 78 def test_suite():
79 -return unittest.makeSuite(InstallScriptsTestCase)
79 +return unittest.TestLoader().loadTestsFromTestCase(InstallScriptsTestCase)
80 80
81 81 if __name__ == "__main__":
82 82 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ def test_non_ascii(self):
40 40 'Fαtal\t\\xc8rr\\u014dr')
41 41
42 42 def test_suite():
43 -return unittest.makeSuite(TestLog)
43 +return unittest.TestLoader().loadTestsFromTestCase(TestLog)
44 44
45 45 if __name__ == "__main__":
46 46 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -178,7 +178,7 @@ def test_remove_entire_manifest(self):
178 178
179 179
180 180 def test_suite():
181 -return unittest.makeSuite(msvc9compilerTestCase)
181 +return unittest.TestLoader().loadTestsFromTestCase(msvc9compilerTestCase)
182 182
183 183 if __name__ == "__main__":
184 184 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ def test_get_vc2015(self):
75 75 raise unittest.SkipTest("VS 2015 is not installed")
76 76
77 77 def test_suite():
78 -return unittest.makeSuite(msvccompilerTestCase)
78 +return unittest.TestLoader().loadTestsFromTestCase(msvccompilerTestCase)
79 79
80 80 if __name__ == "__main__":
81 81 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -318,7 +318,7 @@ def test_show_response(self):
318 318
319 319
320 320 def test_suite():
321 -return unittest.makeSuite(RegisterTestCase)
321 +return unittest.TestLoader().loadTestsFromTestCase(RegisterTestCase)
322 322
323 323 if __name__ == "__main__":
324 324 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -487,7 +487,7 @@ def test_make_distribution_owner_group(self):
487 487 archive.close()
488 488
489 489 def test_suite():
490 -return unittest.makeSuite(SDistTestCase)
490 +return unittest.TestLoader().loadTestsFromTestCase(SDistTestCase)
491 491
492 492 if __name__ == "__main__":
493 493 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -131,7 +131,7 @@ def test_spawn_missing_exe(self):
131 131
132 132
133 133 def test_suite():
134 -return unittest.makeSuite(SpawnTestCase)
134 +return unittest.TestLoader().loadTestsFromTestCase(SpawnTestCase)
135 135
136 136 if __name__ == "__main__":
137 137 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -269,7 +269,7 @@ def test_customize_compiler_before_get_config_vars(self):
269 269
270 270 def test_suite():
271 271 suite = unittest.TestSuite()
272 -suite.addTest(unittest.makeSuite(SysconfigTestCase))
272 +suite.addTest(unittest.TestLoader().loadTestsFromTestCase(SysconfigTestCase))
273 273 return suite
274 274
275 275
Original file line number Diff line number Diff line change
@@ -101,7 +101,7 @@ def test_input(count, description, file, expected_result):
101 101 in_file.close()
102 102
103 103 def test_suite():
104 -return unittest.makeSuite(TextFileTestCase)
104 +return unittest.TestLoader().loadTestsFromTestCase(TextFileTestCase)
105 105
106 106 if __name__ == "__main__":
107 107 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ def gcv(v):
139 139
140 140
141 141 def test_suite():
142 -return unittest.makeSuite(UnixCCompilerTestCase)
142 +return unittest.TestLoader().loadTestsFromTestCase(UnixCCompilerTestCase)
143 143
144 144 if __name__ == "__main__":
145 145 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -217,7 +217,7 @@ def test_wrong_exception_order(self):
217 217
218 218
219 219 def test_suite():
220 -return unittest.makeSuite(uploadTestCase)
220 +return unittest.TestLoader().loadTestsFromTestCase(uploadTestCase)
221 221
222 222 if __name__ == "__main__":
223 223 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -304,7 +304,7 @@ def test_grok_environment_error(self):
304 304
305 305
306 306 def test_suite():
307 -return unittest.makeSuite(UtilTestCase)
307 +return unittest.TestLoader().loadTestsFromTestCase(UtilTestCase)
308 308
309 309 if __name__ == "__main__":
310 310 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ def test_cmp(self):
81 81 (v1, v2, res))
82 82
83 83 def test_suite():
84 -return unittest.makeSuite(VersionTestCase)
84 +return unittest.TestLoader().loadTestsFromTestCase(VersionTestCase)
85 85
86 86 if __name__ == "__main__":
87 87 run_unittest(test_suite())
Original file line number Diff line number Diff line change
@@ -1108,17 +1108,18 @@ def match_test_regex(test_id):
1108 1108 def run_unittest(*classes):
1109 1109 """Run tests from unittest.TestCase-derived classes."""
1110 1110 valid_types = (unittest.TestSuite, unittest.TestCase)
1111 +loader = unittest.TestLoader()
1111 1112 suite = unittest.TestSuite()
1112 1113 for cls in classes:
1113 1114 if isinstance(cls, str):
1114 1115 if cls in sys.modules:
1115 -suite.addTest(unittest.findTestCases(sys.modules[cls]))
1116 +suite.addTest(loader.loadTestsFromModule(sys.modules[cls]))
1116 1117 else:
1117 1118 raise ValueError("str arguments must be keys in sys.modules")
1118 1119 elif isinstance(cls, valid_types):
1119 1120 suite.addTest(cls)
1120 1121 else:
1121 -suite.addTest(unittest.makeSuite(cls))
1122 +suite.addTest(loader.loadTestsFromTestCase(cls))
1122 1123 _filter_suite(suite, match_test)
1123 1124 _run_suite(suite)
1124 1125
Original file line number Diff line number Diff line change
@@ -173,7 +173,7 @@ def test_error(self):
173 173 raise RuntimeError('error message')
174 174
175 175 suite = unittest.TestSuite()
176 -suite.addTest(unittest.makeSuite(TestTests))
176 +suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestTests))
177 177 stream = io.StringIO()
178 178 runner_cls = get_test_runner_class(sum(a == '-v' for a in sys.argv))
179 179 runner = runner_cls(sys.stdout)
Original file line number Diff line number Diff line change
@@ -221,9 +221,8 @@ def load_tests(loader, tests, pattern):
221 221 classes.append(type("TestCase-" + mod.__name__,
222 222 (AnyDBMTestCase, unittest.TestCase),
223 223 {'module': mod}))
224 -suites = [unittest.makeSuite(c) for c in classes]
225 -
226 -tests.addTests(suites)
224 +for c in classes:
225 +tests.addTest(loader.loadTestsFromTestCase(c))
227 226 return tests
228 227
229 228 if __name__ == "__main__":