diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2021-09-19 12:27:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-19 12:27:33 (GMT) |
| commit | 40348acc180580371d25f75f46b27048e35f2435 (patch) | |
| tree | 4ddb641b0dfc1edda6d0a6c044c1380c4900d58a /Lib/test/test_urllib2_localnet.py | |
| parent | 664448d81f41c5fa971d8523a71b0f19e76cc136 (diff) | |
| download | cpython-40348acc180580371d25f75f46b27048e35f2435.zip cpython-40348acc180580371d25f75f46b27048e35f2435.tar.gz cpython-40348acc180580371d25f75f46b27048e35f2435.tar.bz2 | |
bpo-45229: Remove test_main in many tests (GH-28405)
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.
Diffstat (limited to 'Lib/test/test_urllib2_localnet.py')
| -rw-r--r-- | Lib/test/test_urllib2_localnet.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py index ebb43c3..36fb05d 100644 --- a/Lib/test/test_urllib2_localnet.py +++ b/Lib/test/test_urllib2_localnet.py @@ -661,17 +661,10 @@ class TestUrlopen(unittest.TestCase): self.assertEqual(index + 1, len(lines)) -threads_key = None - def setUpModule(): - # Store the threading_setup in a key and ensure that it is cleaned up - # in the tearDown - global threads_key - threads_key = threading_helper.threading_setup() - -def tearDownModule(): - if threads_key: - threading_helper.threading_cleanup(*threads_key) + thread_info = threading_helper.threading_setup() + unittest.addModuleCleanup(threading_helper.threading_cleanup, *thread_info) + if __name__ == "__main__": unittest.main() |