diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index a826e31f5ee079..343e9dcf769e86 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -6126,7 +6126,8 @@ class ThreadsMixin(BaseMixin):
# Functions used to create test cases from the base ones in this module
#
-def install_tests_in_module_dict(remote_globs, start_method):
+def install_tests_in_module_dict(remote_globs, start_method,
+ only_type=None, exclude_types=False):
__module__ = remote_globs['__name__']
local_globs = globals()
ALL_TYPES = {'processes', 'threads', 'manager'}
@@ -6139,6 +6140,10 @@ def install_tests_in_module_dict(remote_globs, start_method):
continue
assert set(base.ALLOWED_TYPES) <= ALL_TYPES, base.ALLOWED_TYPES
for type_ in base.ALLOWED_TYPES:
+ if only_type and type_ != only_type:
+ continue
+ if exclude_types:
+ continue
newname = 'With' + type_.capitalize() + name[1:]
Mixin = local_globs[type_.capitalize() + 'Mixin']
class Temp(base, Mixin, unittest.TestCase):
@@ -6149,6 +6154,9 @@ class Temp(base, Mixin, unittest.TestCase):
Temp.__module__ = __module__
remote_globs[newname] = Temp
elif issubclass(base, unittest.TestCase):
+ if only_type:
+ continue
+
class Temp(base, object):
pass
Temp.__name__ = Temp.__qualname__ = name
diff --git a/Lib/test/libregrtest/runtest.py b/Lib/test/libregrtest/runtest.py
index 61595277ed6d5a..8bcfad2cdb5a28 100644
--- a/Lib/test/libregrtest/runtest.py
+++ b/Lib/test/libregrtest/runtest.py
@@ -150,6 +150,9 @@ def __str__(self) -> str:
SPLITTESTDIRS = {
"test_asyncio",
+ "test_multiprocessing_fork",
+ "test_multiprocessing_forkserver",
+ "test_multiprocessing_spawn",
}
# Storage of uncollectable objects
diff --git a/Lib/test/test_multiprocessing_fork.py b/Lib/test/test_multiprocessing_fork/__init__.py
similarity index 66%
rename from Lib/test/test_multiprocessing_fork.py
rename to Lib/test/test_multiprocessing_fork/__init__.py
index 5000edb7c5c299..aa1fff50b28f5f 100644
--- a/Lib/test/test_multiprocessing_fork.py
+++ b/Lib/test/test_multiprocessing_fork/__init__.py
@@ -1,7 +1,6 @@
-import unittest
-import test._test_multiprocessing
-
+import os.path
import sys
+import unittest
from test import support
if support.PGO:
@@ -13,7 +12,5 @@
if sys.platform == 'darwin':
raise unittest.SkipTest("test may crash on macOS (bpo-33725)")
-test._test_multiprocessing.install_tests_in_module_dict(globals(), 'fork')
-
-if __name__ == '__main__':
- unittest.main()
+def load_tests(*args):
+ return support.load_package_tests(os.path.dirname(__file__), *args)
diff --git a/Lib/test/test_multiprocessing_fork/test_manager.py b/Lib/test/test_multiprocessing_fork/test_manager.py
new file mode 100644
index 00000000000000..9efbb83bbb73bf
--- /dev/null
+++ b/Lib/test/test_multiprocessing_fork/test_manager.py
@@ -0,0 +1,7 @@
+import unittest
+from test._test_multiprocessing import install_tests_in_module_dict
+
+install_tests_in_module_dict(globals(), 'fork', only_type="manager")
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Lib/test/test_multiprocessing_fork/test_misc.py b/Lib/test/test_multiprocessing_fork/test_misc.py
new file mode 100644
index 00000000000000..891a494020c3a1
--- /dev/null
+++ b/Lib/test/test_multiprocessing_fork/test_misc.py
@@ -0,0 +1,7 @@
+import unittest
+from test._test_multiprocessing import install_tests_in_module_dict
+
+install_tests_in_module_dict(globals(), 'fork', exclude_types=True)
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Lib/test/test_multiprocessing_fork/test_processes.py b/Lib/test/test_multiprocessing_fork/test_processes.py
new file mode 100644
index 00000000000000..e64e9afc0100e8
--- /dev/null
+++ b/Lib/test/test_multiprocessing_fork/test_processes.py
@@ -0,0 +1,7 @@
+import unittest
+from test._test_multiprocessing import install_tests_in_module_dict
+
+install_tests_in_module_dict(globals(), 'fork', only_type="processes")
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Lib/test/test_multiprocessing_fork/test_threads.py b/Lib/test/test_multiprocessing_fork/test_threads.py
new file mode 100644
index 00000000000000..1670e34cb17f25
--- /dev/null
+++ b/Lib/test/test_multiprocessing_fork/test_threads.py
@@ -0,0 +1,7 @@
+import unittest
+from test._test_multiprocessing import install_tests_in_module_dict
+
+install_tests_in_module_dict(globals(), 'fork', only_type="threads")
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Lib/test/test_multiprocessing_forkserver.py b/Lib/test/test_multiprocessing_forkserver/__init__.py
similarity index 58%
rename from Lib/test/test_multiprocessing_forkserver.py
rename to Lib/test/test_multiprocessing_forkserver/__init__.py
index 6ad5faf9e8a329..d91715a344dfa7 100644
--- a/Lib/test/test_multiprocessing_forkserver.py
+++ b/Lib/test/test_multiprocessing_forkserver/__init__.py
@@ -1,7 +1,6 @@
-import unittest
-import test._test_multiprocessing
-
+import os.path
import sys
+import unittest
from test import support
if support.PGO:
@@ -10,7 +9,5 @@
if sys.platform == "win32":
raise unittest.SkipTest("forkserver is not available on Windows")
-test._test_multiprocessing.install_tests_in_module_dict(globals(), 'forkserver')
-
-if __name__ == '__main__':
- unittest.main()
+def load_tests(*args):
+ return support.load_package_tests(os.path.dirname(__file__), *args)
diff --git a/Lib/test/test_multiprocessing_forkserver/test_manager.py b/Lib/test/test_multiprocessing_forkserver/test_manager.py
new file mode 100644
index 00000000000000..14f8f10dfb4e2f
--- /dev/null
+++ b/Lib/test/test_multiprocessing_forkserver/test_manager.py
@@ -0,0 +1,7 @@
+import unittest
+from test._test_multiprocessing import install_tests_in_module_dict
+
+install_tests_in_module_dict(globals(), 'forkserver', only_type="manager")
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Lib/test/test_multiprocessing_forkserver/test_misc.py b/Lib/test/test_multiprocessing_forkserver/test_misc.py
new file mode 100644
index 00000000000000..9cae1b50f71e00
--- /dev/null
+++ b/Lib/test/test_multiprocessing_forkserver/test_misc.py
@@ -0,0 +1,7 @@
+import unittest
+from test._test_multiprocessing import install_tests_in_module_dict
+
+install_tests_in_module_dict(globals(), 'forkserver', exclude_types=True)
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Lib/test/test_multiprocessing_forkserver/test_processes.py b/Lib/test/test_multiprocessing_forkserver/test_processes.py
new file mode 100644
index 00000000000000..360967cf1ae152
--- /dev/null
+++ b/Lib/test/test_multiprocessing_forkserver/test_processes.py
@@ -0,0 +1,7 @@
+import unittest
+from test._test_multiprocessing import install_tests_in_module_dict
+
+install_tests_in_module_dict(globals(), 'forkserver', only_type="processes")
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Lib/test/test_multiprocessing_forkserver/test_threads.py b/Lib/test/test_multiprocessing_forkserver/test_threads.py
new file mode 100644
index 00000000000000..719c752aa05350
--- /dev/null
+++ b/Lib/test/test_multiprocessing_forkserver/test_threads.py
@@ -0,0 +1,7 @@
+import unittest
+from test._test_multiprocessing import install_tests_in_module_dict
+
+install_tests_in_module_dict(globals(), 'forkserver', only_type="threads")
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Lib/test/test_multiprocessing_spawn.py b/Lib/test/test_multiprocessing_spawn.py
deleted file mode 100644
index 6558952308f25c..00000000000000
--- a/Lib/test/test_multiprocessing_spawn.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import unittest
-import test._test_multiprocessing
-
-from test import support
-
-if support.PGO:
- raise unittest.SkipTest("test is not helpful for PGO")
-
-test._test_multiprocessing.install_tests_in_module_dict(globals(), 'spawn')
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/Lib/test/test_multiprocessing_spawn/__init__.py b/Lib/test/test_multiprocessing_spawn/__init__.py
new file mode 100644
index 00000000000000..3fd0f9b390612a
--- /dev/null
+++ b/Lib/test/test_multiprocessing_spawn/__init__.py
@@ -0,0 +1,9 @@
+import os.path
+import unittest
+from test import support
+
+if support.PGO:
+ raise unittest.SkipTest("test is not helpful for PGO")
+
+def load_tests(*args):
+ return support.load_package_tests(os.path.dirname(__file__), *args)
diff --git a/Lib/test/test_multiprocessing_spawn/test_manager.py b/Lib/test/test_multiprocessing_spawn/test_manager.py
new file mode 100644
index 00000000000000..b40bea0bf61581
--- /dev/null
+++ b/Lib/test/test_multiprocessing_spawn/test_manager.py
@@ -0,0 +1,7 @@
+import unittest
+from test._test_multiprocessing import install_tests_in_module_dict
+
+install_tests_in_module_dict(globals(), 'spawn', only_type="manager")
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Lib/test/test_multiprocessing_spawn/test_misc.py b/Lib/test/test_multiprocessing_spawn/test_misc.py
new file mode 100644
index 00000000000000..32f37c5cc81ee1
--- /dev/null
+++ b/Lib/test/test_multiprocessing_spawn/test_misc.py
@@ -0,0 +1,7 @@
+import unittest
+from test._test_multiprocessing import install_tests_in_module_dict
+
+install_tests_in_module_dict(globals(), 'spawn', exclude_types=True)
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Lib/test/test_multiprocessing_spawn/test_processes.py b/Lib/test/test_multiprocessing_spawn/test_processes.py
new file mode 100644
index 00000000000000..af764b0d8483ab
--- /dev/null
+++ b/Lib/test/test_multiprocessing_spawn/test_processes.py
@@ -0,0 +1,7 @@
+import unittest
+from test._test_multiprocessing import install_tests_in_module_dict
+
+install_tests_in_module_dict(globals(), 'spawn', only_type="processes")
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Lib/test/test_multiprocessing_spawn/test_threads.py b/Lib/test/test_multiprocessing_spawn/test_threads.py
new file mode 100644
index 00000000000000..c1257749b9c419
--- /dev/null
+++ b/Lib/test/test_multiprocessing_spawn/test_threads.py
@@ -0,0 +1,7 @@
+import unittest
+from test._test_multiprocessing import install_tests_in_module_dict
+
+install_tests_in_module_dict(globals(), 'spawn', only_type="threads")
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Misc/NEWS.d/next/Tests/2023-08-24-04-23-35.gh-issue-108388.mr0MeE.rst b/Misc/NEWS.d/next/Tests/2023-08-24-04-23-35.gh-issue-108388.mr0MeE.rst
new file mode 100644
index 00000000000000..8cf77b1cc187f1
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2023-08-24-04-23-35.gh-issue-108388.mr0MeE.rst
@@ -0,0 +1,4 @@
+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. Patch by Victor Stinner.
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy