Skip to content

Commit 132e2b2

Browse files
vstinnermiss-islington
authored andcommitted
gh-139208: Fix regrtest --fast-ci --verbose (GH-139240)
Don't ignore the --verbose option anymore. (cherry picked from commit dd683f8) Co-authored-by: Victor Stinner <[email protected]>
1 parent 5775c00 commit 132e2b2

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

Lib/test/libregrtest/cmdline.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,11 @@ def _parse_args(args, **kwargs):
437437
if ns.python is None:
438438
ns.rerun = True
439439
ns.print_slow = True
440-
ns.verbose3 = True
440+
if not ns.verbose:
441+
ns.verbose3 = True
442+
else:
443+
# --verbose has the priority over --verbose3
444+
pass
441445
else:
442446
ns._add_python_opts = False
443447

Lib/test/test_regrtest.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,8 @@ def create_regrtest(self, args):
445445

446446
return regrtest
447447

448-
def check_ci_mode(self, args, use_resources, *, rerun=True, randomize=True):
448+
def check_ci_mode(self, args, use_resources,
449+
*, rerun=True, randomize=True, output_on_failure=True):
449450
regrtest = self.create_regrtest(args)
450451
self.assertEqual(regrtest.num_workers, -1)
451452
self.assertEqual(regrtest.want_rerun, rerun)
@@ -454,7 +455,7 @@ def check_ci_mode(self, args, use_resources, *, rerun=True, randomize=True):
454455
self.assertIsInstance(regrtest.random_seed, int)
455456
self.assertTrue(regrtest.fail_env_changed)
456457
self.assertTrue(regrtest.print_slowest)
457-
self.assertTrue(regrtest.output_on_failure)
458+
self.assertEqual(regrtest.output_on_failure, output_on_failure)
458459
self.assertEqual(sorted(regrtest.use_resources), sorted(use_resources))
459460
return regrtest
460461

@@ -481,6 +482,14 @@ def test_fast_ci_resource(self):
481482
use_resources.remove('network')
482483
self.check_ci_mode(args, use_resources)
483484

485+
def test_fast_ci_verbose(self):
486+
args = ['--fast-ci', '--verbose']
487+
use_resources = sorted(cmdline.ALL_RESOURCES)
488+
use_resources.remove('cpu')
489+
regrtest = self.check_ci_mode(args, use_resources,
490+
output_on_failure=False)
491+
self.assertEqual(regrtest.verbose, True)
492+
484493
def test_slow_ci(self):
485494
args = ['--slow-ci']
486495
use_resources = sorted(cmdline.ALL_RESOURCES)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix regrtest ``--fast-ci --verbose``: don't ignore the ``--verbose`` option
2+
anymore. Patch by Victor Stinner.

0 commit comments

Comments
 (0)