mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Remove unused --debug option of regrtest.

Browse source 
If bots fail due to using this flag, the buildbot scripts have to be modified
to omit it. Regrtest ignores it anyway.
This commit is contained in:
Eli Bendersky 2013-09-02 17:01:10 -07:00
parent e5eebedd55
commit e8de29669d
2 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/test/regrtest.py
View file

@ -252,8 +252,6 @@ def _create_parser():
help='re-run failed tests in verbose mode') help='re-run failed tests in verbose mode')
group.add_argument('-W', '--verbose3', action='store_true', group.add_argument('-W', '--verbose3', action='store_true',
help='display test output on failure') help='display test output on failure')
group.add_argument('-d', '--debug', action='store_true',
help='print traceback for failed tests')
group.add_argument('-q', '--quiet', action='store_true', group.add_argument('-q', '--quiet', action='store_true',
help='no output unless one or more tests fail') help='no output unless one or more tests fail')
group.add_argument('-o', '--slow', action='store_true', dest='print_slow', group.add_argument('-o', '--slow', action='store_true', dest='print_slow',
@ -442,7 +440,7 @@ def run_test_in_subprocess(testname, ns):
(testname, ns.verbose, ns.quiet), (testname, ns.verbose, ns.quiet),
dict(huntrleaks=ns.huntrleaks, dict(huntrleaks=ns.huntrleaks,
use_resources=ns.use_resources, use_resources=ns.use_resources,
debug=ns.debug, output_on_failure=ns.verbose3, output_on_failure=ns.verbose3,
timeout=ns.timeout, failfast=ns.failfast, timeout=ns.timeout, failfast=ns.failfast,
match_tests=ns.match_tests)) match_tests=ns.match_tests))
# Running the child from the same working directory as regrtest's original # Running the child from the same working directory as regrtest's original
@ -757,7 +755,7 @@ def main(tests=None, **kwargs):
else: else:
try: try:
result = runtest(test, ns.verbose, ns.quiet, result = runtest(test, ns.verbose, ns.quiet,
ns.huntrleaks, ns.debug, ns.huntrleaks,
output_on_failure=ns.verbose3, output_on_failure=ns.verbose3,
timeout=ns.timeout, failfast=ns.failfast, timeout=ns.timeout, failfast=ns.failfast,
match_tests=ns.match_tests) match_tests=ns.match_tests)
@ -817,7 +815,7 @@ def main(tests=None, **kwargs):
sys.stdout.flush() sys.stdout.flush()
try: try:
ns.verbose = True ns.verbose = True
ok = runtest(test, True, ns.quiet, ns.huntrleaks, ns.debug, ok = runtest(test, True, ns.quiet, ns.huntrleaks,
timeout=ns.timeout) timeout=ns.timeout)
except KeyboardInterrupt: except KeyboardInterrupt:
# print a newline separate from the ^C # print a newline separate from the ^C
@ -910,7 +908,7 @@ def replace_stdout():
atexit.register(restore_stdout) atexit.register(restore_stdout)
def runtest(test, verbose, quiet, def runtest(test, verbose, quiet,
huntrleaks=False, debug=False, use_resources=None, huntrleaks=False, use_resources=None,
output_on_failure=False, failfast=False, match_tests=None, output_on_failure=False, failfast=False, match_tests=None,
timeout=None): timeout=None):
"""Run a single test. """Run a single test.
@ -964,7 +962,7 @@ def runtest(test, verbose, quiet,
sys.stdout = stream sys.stdout = stream
sys.stderr = stream sys.stderr = stream
result = runtest_inner(test, verbose, quiet, huntrleaks, result = runtest_inner(test, verbose, quiet, huntrleaks,
debug, display_failure=False) display_failure=False)
if result[0] == FAILED: if result[0] == FAILED:
output = stream.getvalue() output = stream.getvalue()
orig_stderr.write(output) orig_stderr.write(output)
@ -974,7 +972,7 @@ def runtest(test, verbose, quiet,
sys.stderr = orig_stderr sys.stderr = orig_stderr
else: else:
support.verbose = verbose # Tell tests to be moderately quiet support.verbose = verbose # Tell tests to be moderately quiet
result = runtest_inner(test, verbose, quiet, huntrleaks, debug, result = runtest_inner(test, verbose, quiet, huntrleaks,
display_failure=not verbose) display_failure=not verbose)
return result return result
finally: finally:
@ -1255,7 +1253,7 @@ class saved_test_environment:
def runtest_inner(test, verbose, quiet, def runtest_inner(test, verbose, quiet,
huntrleaks=False, debug=False, display_failure=True): huntrleaks=False, display_failure=True):
support.unload(test) support.unload(test)
test_time = 0.0 test_time = 0.0

6
Lib/test/test_regrtest.py
View file

@ -71,12 +71,6 @@ class ParseArgsTestCase(unittest.TestCase):
ns = regrtest._parse_args([opt]) ns = regrtest._parse_args([opt])
self.assertTrue(ns.verbose3) self.assertTrue(ns.verbose3)
def test_debug(self):
for opt in '-d', '--debug':
with self.subTest(opt=opt):
ns = regrtest._parse_args([opt])
self.assertTrue(ns.debug)
def test_quiet(self): def test_quiet(self):
for opt in '-q', '--quiet': for opt in '-q', '--quiet':
with self.subTest(opt=opt): with self.subTest(opt=opt):