Skip to content

Commit aa9a359

Browse files
vstinnervstinner
authored
gh-108388: Split test_multiprocessing_spawn (#108396)
Split test_multiprocessing_fork, test_multiprocessing_forkserver and test_multiprocessing_spawn into test packages. Each package is made of 4 sub-tests: processes, threads, manager and misc. It allows running more tests in parallel and so reduce the total test duration.
1 parent 174e9da commit aa9a359

19 files changed

Lines changed: 117 additions & 27 deletions

‎Lib/test/_test_multiprocessing.py‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6126,7 +6126,8 @@ class ThreadsMixin(BaseMixin):
61266126
# Functions used to create test cases from the base ones in this module
61276127
#
61286128

6129-
def install_tests_in_module_dict(remote_globs, start_method):
6129+
def install_tests_in_module_dict(remote_globs, start_method,
6130+
only_type=None, exclude_types=False):
61306131
__module__ = remote_globs['__name__']
61316132
local_globs = globals()
61326133
ALL_TYPES = {'processes', 'threads', 'manager'}
@@ -6139,6 +6140,10 @@ def install_tests_in_module_dict(remote_globs, start_method):
61396140
continue
61406141
assert set(base.ALLOWED_TYPES) <= ALL_TYPES, base.ALLOWED_TYPES
61416142
for type_ in base.ALLOWED_TYPES:
6143+
if only_type and type_ != only_type:
6144+
continue
6145+
if exclude_types:
6146+
continue
61426147
newname = 'With' + type_.capitalize() + name[1:]
61436148
Mixin = local_globs[type_.capitalize() + 'Mixin']
61446149
class Temp(base, Mixin, unittest.TestCase):
@@ -6149,6 +6154,9 @@ class Temp(base, Mixin, unittest.TestCase):
61496154
Temp.__module__ = __module__
61506155
remote_globs[newname] = Temp
61516156
elif issubclass(base, unittest.TestCase):
6157+
if only_type:
6158+
continue
6159+
61526160
class Temp(base, object):
61536161
pass
61546162
Temp.__name__ = Temp.__qualname__ = name

‎Lib/test/libregrtest/runtest.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ def __str__(self) -> str:
132132

133133
SPLITTESTDIRS = {
134134
"test_asyncio",
135+
"test_multiprocessing_fork",
136+
"test_multiprocessing_forkserver",
137+
"test_multiprocessing_spawn",
135138
}
136139

137140
# Storage of uncollectable objects

Lib/test/test_multiprocessing_fork.py renamed to Lib/test/test_multiprocessing_fork/__init__.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import unittest
2-
import test._test_multiprocessing
3-
1+
import os.path
42
import sys
3+
import unittest
54
from test import support
65

76
if support.PGO:
@@ -13,7 +12,5 @@
1312
if sys.platform == 'darwin':
1413
raise unittest.SkipTest("test may crash on macOS (bpo-33725)")
1514

16-
test._test_multiprocessing.install_tests_in_module_dict(globals(), 'fork')
17-
18-
if __name__ == '__main__':
19-
unittest.main()
15+
def load_tests(*args):
16+
return support.load_package_tests(os.path.dirname(__file__), *args)

‎Lib/test/test_multiprocessing_fork/test_manager.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import unittest
2+
from test._test_multiprocessing import install_tests_in_module_dict
3+
4+
install_tests_in_module_dict(globals(), 'fork', only_type="manager")
5+
6+
if __name__ == '__main__':
7+
unittest.main()

‎Lib/test/test_multiprocessing_fork/test_misc.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import unittest
2+
from test._test_multiprocessing import install_tests_in_module_dict
3+
4+
install_tests_in_module_dict(globals(), 'fork', exclude_types=True)
5+
6+
if __name__ == '__main__':
7+
unittest.main()

‎Lib/test/test_multiprocessing_fork/test_processes.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import unittest
2+
from test._test_multiprocessing import install_tests_in_module_dict
3+
4+
install_tests_in_module_dict(globals(), 'fork', only_type="processes")
5+
6+
if __name__ == '__main__':
7+
unittest.main()

‎Lib/test/test_multiprocessing_fork/test_threads.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import unittest
2+
from test._test_multiprocessing import install_tests_in_module_dict
3+
4+
install_tests_in_module_dict(globals(), 'fork', only_type="threads")
5+
6+
if __name__ == '__main__':
7+
unittest.main()

Lib/test/test_multiprocessing_forkserver.py renamed to Lib/test/test_multiprocessing_forkserver/__init__.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import unittest
2-
import test._test_multiprocessing
3-
1+
import os.path
42
import sys
3+
import unittest
54
from test import support
65

76
if support.PGO:
@@ -10,7 +9,5 @@
109
if sys.platform == "win32":
1110
raise unittest.SkipTest("forkserver is not available on Windows")
1211

13-
test._test_multiprocessing.install_tests_in_module_dict(globals(), 'forkserver')
14-
15-
if __name__ == '__main__':
16-
unittest.main()
12+
def load_tests(*args):
13+
return support.load_package_tests(os.path.dirname(__file__), *args)

‎Lib/test/test_multiprocessing_forkserver/test_manager.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import unittest
2+
from test._test_multiprocessing import install_tests_in_module_dict
3+
4+
install_tests_in_module_dict(globals(), 'forkserver', only_type="manager")
5+
6+
if __name__ == '__main__':
7+
unittest.main()

‎Lib/test/test_multiprocessing_forkserver/test_misc.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import unittest
2+
from test._test_multiprocessing import install_tests_in_module_dict
3+
4+
install_tests_in_module_dict(globals(), 'forkserver', exclude_types=True)
5+
6+
if __name__ == '__main__':
7+
unittest.main()

0 commit comments

Comments
 (0)