Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Lib/test/libregrtest/cmdline.py
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,11 @@ def _parse_args(args, **kwargs):
if ns.python is None:
ns.rerun = True
ns.print_slow = True
ns.verbose3 = True
if not ns.verbose:
ns.verbose3 = True
else:
# --verbose has the priority over --verbose3
pass
else:
ns._add_python_opts = False

Expand Down
13 changes: 11 additions & 2 deletions Lib/test/test_regrtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,8 @@ def create_regrtest(self, args):

return regrtest

def check_ci_mode(self, args, use_resources, *, rerun=True, randomize=True):
def check_ci_mode(self, args, use_resources,
*, rerun=True, randomize=True, output_on_failure=True):
regrtest = self.create_regrtest(args)
self.assertEqual(regrtest.num_workers, -1)
self.assertEqual(regrtest.want_rerun, rerun)
Expand All @@ -454,7 +455,7 @@ def check_ci_mode(self, args, use_resources, *, rerun=True, randomize=True):
self.assertIsInstance(regrtest.random_seed, int)
self.assertTrue(regrtest.fail_env_changed)
self.assertTrue(regrtest.print_slowest)
self.assertTrue(regrtest.output_on_failure)
self.assertEqual(regrtest.output_on_failure, output_on_failure)
self.assertEqual(sorted(regrtest.use_resources), sorted(use_resources))
return regrtest

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

def test_fast_ci_verbose(self):
args = ['--fast-ci', '--verbose']
use_resources = sorted(cmdline.ALL_RESOURCES)
use_resources.remove('cpu')
regrtest = self.check_ci_mode(args, use_resources,
output_on_failure=False)
self.assertEqual(regrtest.verbose, True)

def test_slow_ci(self):
args = ['--slow-ci']
use_resources = sorted(cmdline.ALL_RESOURCES)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix regrtest ``--fast-ci --verbose``: don't ignore the ``--verbose`` option
anymore. Patch by Victor Stinner.
Loading