8000 [3.9] bpo-45229: Remove test_main in many tests (GH-28405) (GH-28456) · python/cpython@5822ab6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5822ab6

Browse files
serhiy-storchakaserhiy-storchaka
authored
[3.9] bpo-45229: Remove test_main in many tests (GH-28405) (GH-28456)
Instead of explicitly enumerate test classes for run_unittest() use the unittest ability to discover tests. This also makes these tests discoverable and runnable with unittest. load_tests() can be used for dynamic generating tests and adding doctests. setUpModule(), tearDownModule() and addModuleCleanup() can be used for running code before and after all module tests.. (cherry picked from commit 40348ac)
1 parent 41e2a31 commit 5822ab6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+211
-472
lines changed

‎Lib/lib2to3/tests/data/py2_test_grammar.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# regression test, the filterwarnings() call has been added to
99
# regrtest.py.
1010

11-
from test.test_support import run_unittest, check_syntax_error
11+
from test.test_support import check_syntax_error
1212
import unittest
1313
import sys
1414
# testing import *
@@ -967,8 +967,5 @@ def _checkeval(msg, ret):
967967
self.assertEqual((6 < 4 if 0 else 2), 2)
968968

969969

970-
def test_main():
971-
run_unittest(TokenTests, GrammarTests)
972-
973970
if __name__ == '__main__':
974-
test_main()
971+
unittest.main()

‎Lib/lib2to3/tests/data/py3_test_grammar.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# regression test, the filterwarnings() call has been added to
99
# regrtest.py.
1010

11-
from test.support import run_unittest, check_syntax_error
11+
from test.support import check_syntax_error
1212
import unittest
1313
import sys
1414
# testing import *
@@ -952,8 +952,5 @@ def _checkeval(msg, ret):
952952
self.assertEqual((6 < 4 if 0 else 2), 2)
953953

954954

955-
def test_main():
956-
run_unittest(TokenTests, GrammarTests)
957-
958955
if __name__ == '__main__':
959-
test_main()
956+
unittest.main()

‎Lib/test/support/__init__.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,9 +1525,8 @@ def check_sizeof(test, o, size):
15251525
# Decorator for running a function in a different locale, correctly resetting
15261526
# it afterwards.
15271527

1528+
@contextlib.contextmanager
15281529
def run_with_locale(catstr, *locales):
1529-
def decorator(func):
1530-
def inner(*args, **kwds):
15311530
try:
15321531
import locale
15331532
category = getattr(locale, catstr)
@@ -1546,16 +1545,11 @@ def inner(*args, **kwds):
15461545
except:
15471546
pass
15481547

1549-
# now run the function, resetting the locale on exceptions
15501548
try:
1551-
return func(*args, **kwds)
1549+
yield
15521550
finally:
15531551
if locale and orig_locale:
15541552
locale.setlocale(category, orig_locale)
1555-
inner.__name__ = func.__name__
1556-
inner.__doc__ = func.__doc__
1557-
return inner
1558-
return decorator
15591553

15601554
#=======================================================================
15611555
# Decorator for running a function in a specific timezone, correctly

‎Lib/test/test_argparse.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5394,13 +5394,11 @@ def test_exit_on_error_with_bad_args(self):
53945394
self.parser.parse_args('--integers a'.split())
53955395

53965396

5397-
def test_main():
5398-
support.run_unittest(__name__)
5397+
def tearDownModule():
53995398
# Remove global references to avoid looking like we have refleaks.
54005399
RFile.seen = {}
54015400
WFile.seen = set()
54025401

54035402

5404-
54055403
if __name__ == '__main__':
5406-
test_main()
5404+
unittest.main()

‎Lib/test/test_bdb.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,13 +1149,6 @@ def main():
11491149
with TracerRun(self) as tracer:
11501150
tracer.runcall(tfunc_import)
11511151

1152-
def test_main():
1153-
test.support.run_unittest(
1154-
StateTestCase,
1155-
RunTestCase,
1156-
BreakpointTestCase,
1157-
IssuesTestCase,
1158-
)
11591152

11601153
if __name__ == "__main__":
1161-
test_main()
1154+
unittest.main()

‎Lib/test/test_bigaddrspace.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,7 @@ def test_repeat(self):
9292
x = None
9393

9494

95-
def test_main():
96-
support.run_unittest(BytesTest, StrTest)
97-
9895
if __name__ == '__main__':
9996
if len(sys.argv) > 1:
10097
support.set_memlimit(sys.argv[1])
101-
test_main()
98+
unittest.main()

‎Lib/test/test_bigmem.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,11 +1247,8 @@ def test_sort(self, size):
12471247
self.assertEqual(l[:10], [1] * 10)
12481248
self.assertEqual(l[-10:], [5] * 10)
12491249

1250-
def test_main():
1251-
support.run_unittest(StrTest, BytesTest, BytearrayTest,
1252-
TupleTest, ListTest)
12531250

12541251
if __name__ == '__main__':
12551252
if len(sys.argv) > 1:
12561253
support.set_memlimit(sys.argv[1])
1257-
test_main()
1254+
unittest.main()

‎Lib/test/test_bool.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,6 @@ def test_real_and_imag(self):
362362
self.assertIs(type(False.real), int)
363363
self.assertIs(type(False.imag), int)
364364

365-
def test_main():
366-
support.run_unittest(BoolTest)
367365

368366
if __name__ == "__main__":
369-
test_main()
367+
unittest.main()

‎Lib/test/test_bz2.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,15 +1002,9 @@ def test_newline(self):
10021002
self.assertEqual(f.readlines(), [text])
10031003

10041004

1005-
def test_main():
1006-
support.run_unittest(
1007-
BZ2FileTest,
1008-
BZ2CompressorTest,
1009-
BZ2DecompressorTest,
1010-
CompressDecompressTest,
1011-
OpenTest,
1012-
)
1005+
def tearDownModule():
10131006
support.reap_children()
10141007

1008+
10151009
if __name__ == '__main__':
1016-
test_main()
1010+
unittest.main()

‎Lib/test/test_c_locale_coercion.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -427,12 +427,9 @@ def test_PYTHONCOERCECLOCALE_set_to_one(self):
427427
self.assertEqual(cmd.stdout.rstrip(), loc)
428428

429429

430-
def test_main():
431-
support.run_unittest(
432-
LocaleConfigurationTests,
433-
LocaleCoercionTests
434-
)
430+
def tearDownModule():
435431
support.reap_children()
436432

433+
437434
if __name__ == "__main__":
438-
test_main()
435+
unittest.main()

0 commit comments

Comments
 (0)
0