Rename the option to: --single-process

python · vstinner · Jun 3, 2024 · May 29, 2024 · May 29, 2024 · Jun 3, 2024
commit 4d50b872f298d202ce80096fd980227aa6d7cefb
diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py
@@ -174,7 +174,7 @@ def __init__(self, **kwargs) -> None:
         self.tempdir = None
         self._add_python_opts = True
         self.xmlpath = None
-        self.sequentially = False
+        self.single_process = False
 
         super().__init__(**kwargs)
 
@@ -308,10 +308,12 @@ def _create_parser():
     group.add_argument('-j', '--multiprocess', metavar='PROCESSES',
                        dest='use_mp', type=int,
                        help='run PROCESSES processes at once')
-    group.add_argument('--sequentially', action='store_true',
-                       help='always run all tests sequentially, '
-                            'ignore -jN option, '
-                            'and failed tests are also rerun sequentially')
+    group.add_argument('--single-process', action='store_true',
+                       dest='single_process',
+                       help='always run all tests sequentially in '
+                            'a single process, ignore -jN option, '
+                            'and failed tests are also rerun sequentially '
+                            'in the same process')
     group.add_argument('-T', '--coverage', action='store_true',
                        dest='trace',
                        help='turn on code coverage tracing using the trace '
@@ -440,6 +442,10 @@ def _parse_args(args, **kwargs):
     else:
         ns._add_python_opts = False
 
+    # --singleprocess overrides -jN option
+    if ns.single_process:
+        ns.use_mp = None
+
     # When both --slow-ci and --fast-ci options are present,
     # --slow-ci has the priority
     if ns.slow_ci:

diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
@@ -89,15 +89,13 @@ def __init__(self, ns: Namespace, _add_python_opts: bool = False):
         self.cmdline_args: TestList = ns.args
 
         # Workers
-        self.sequentially: bool = ns.sequentially
-        if self.sequentially:
-            num_workers = 0  # run sequentially
-        elif ns.use_mp is None:
-            num_workers = 0  # run sequentially
+        self.single_process: bool = ns.single_process
+        if self.single_process or ns.use_mp is None:
+            num_workers = 0   # run sequentially in a single process
         elif ns.use_mp <= 0:
-            num_workers = -1  # use the number of CPUs
+            num_workers = -1  # run in parallel, use the number of CPUs
         else:
-            num_workers = ns.use_mp
+            num_workers = ns.use_mp  # run in parallel
         self.num_workers: int = num_workers
         self.worker_json: StrJSON | None = ns.worker_json
 
@@ -239,7 +237,7 @@ def list_tests(tests: TestTuple):
 
     def _rerun_failed_tests(self, runtests: RunTests):
         # Configure the runner to re-run tests
-        if self.num_workers == 0 and not self.sequentially:
+        if self.num_workers == 0 and not self.single_process:
             # Always run tests in fresh processes to have more deterministic
             # initial state. Don't re-run tests in parallel but limit to a
             # single worker process to have side effects (on the system load
@@ -260,7 +258,7 @@ def _rerun_failed_tests(self, runtests: RunTests):
         self.logger.set_tests(runtests)
 
         msg = f"Re-running {len(tests)} failed tests in verbose mode"
-        if not self.sequentially:
+        if not self.single_process:
             msg = f"{msg} in subprocesses"
             self.log(msg)
             self._run_tests_mp(runtests, self.num_workers)
@@ -381,7 +379,7 @@ def run_tests_sequentially(self, runtests) -> None:
             tests = count(jobs, 'test')
         else:
             tests = 'tests'
-        msg = f"Run {tests} sequentially"
+        msg = f"Run {tests} sequentially in a single process"
         if runtests.timeout:
             msg += " (timeout: %s)" % format_duration(runtests.timeout)
         self.log(msg)
@@ -609,7 +607,7 @@ def _add_cross_compile_opts(self, regrtest_opts):
             keep_environ = True
 
         if cross_compile and hostrunner:
-            if self.num_workers == 0 and not self.sequentially:
+            if self.num_workers == 0 and not self.single_process:
                 # For now use only two cores for cross-compiled builds;
                 # hostrunner can be expensive.
                 regrtest_opts.extend(['-j', '2'])

diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
@@ -473,12 +473,18 @@ def test_verbose3_huntrleaks(self):
         self.assertEqual(regrtest.hunt_refleak.runs, 10)
         self.assertFalse(regrtest.output_on_failure)
 
-    def test_sequentially(self):
-        args = ['-j2', '--sequentially']
+    def test_single_process(self):
+        args = ['-j2', '--single-process']
         with support.captured_stderr():
             regrtest = self.create_regrtest(args)
         self.assertEqual(regrtest.num_workers, 0)
-        self.assertTrue(regrtest.sequentially)
+        self.assertTrue(regrtest.single_process)
+
+        args = ['--fast-ci', '--single-process']
+        with support.captured_stderr():
+            regrtest = self.create_regrtest(args)
+        self.assertEqual(regrtest.num_workers, 0)
+        self.assertTrue(regrtest.single_process)
 
 
 @dataclasses.dataclass(slots=True)