diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2021-09-19 19:36:03 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-19 19:36:03 (GMT) |
| commit | bedce3538cca3469ac3efc614ef062367cbb2ff1 (patch) | |
| tree | 4eeab0425eddc0520a29f6ebaadb9d8171523394 /Lib/lib2to3 | |
| parent | 9c23a1ebade19f20c7d6e592a7d0329545a9a746 (diff) | |
| download | cpython-bedce3538cca3469ac3efc614ef062367cbb2ff1.zip cpython-bedce3538cca3469ac3efc614ef062367cbb2ff1.tar.gz cpython-bedce3538cca3469ac3efc614ef062367cbb2ff1.tar.bz2 | |
[3.10] bpo-45229: Remove test_main in many tests (GH-28405) (GH-28455)
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 40348acc180580371d25f75f46b27048e35f2435)
Diffstat (limited to 'Lib/lib2to3')
| -rw-r--r-- | Lib/lib2to3/tests/data/py2_test_grammar.py | 7 | ||||
| -rw-r--r-- | Lib/lib2to3/tests/data/py3_test_grammar.py | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/Lib/lib2to3/tests/data/py2_test_grammar.py b/Lib/lib2to3/tests/data/py2_test_grammar.py index 8663161..f9e4ea1 100644 --- a/Lib/lib2to3/tests/data/py2_test_grammar.py +++ b/Lib/lib2to3/tests/data/py2_test_grammar.py @@ -8,7 +8,7 @@ # regression test, the filterwarnings() call has been added to # regrtest.py. -from test.test_support import run_unittest, check_syntax_error +from test.test_support import check_syntax_error import unittest import sys # testing import * @@ -967,8 +967,5 @@ hello world self.assertEqual((6 < 4 if 0 else 2), 2) -def test_main(): - run_unittest(TokenTests, GrammarTests) - if __name__ == '__main__': - test_main() + unittest.main() diff --git a/Lib/lib2to3/tests/data/py3_test_grammar.py b/Lib/lib2to3/tests/data/py3_test_grammar.py index e1eee52..a4a3f7e 100644 --- a/Lib/lib2to3/tests/data/py3_test_grammar.py +++ b/Lib/lib2to3/tests/data/py3_test_grammar.py @@ -8,7 +8,7 @@ # regression test, the filterwarnings() call has been added to # regrtest.py. -from test.support import run_unittest, check_syntax_error +from test.support import check_syntax_error import unittest import sys # testing import * @@ -952,8 +952,5 @@ class GrammarTests(unittest.TestCase): self.assertEqual((6 < 4 if 0 else 2), 2) -def test_main(): - run_unittest(TokenTests, GrammarTests) - if __name__ == '__main__': - test_main() + unittest.main() |