[Python-checkins] cpython: Remove unused --debug option of regrtest.
eli.bendersky
python-checkins at python.org
Tue Sep 3 02:01:40 CEST 2013
http://hg.python.org/cpython/rev/aeb3faaf4754
changeset: 85505:aeb3faaf4754
user: Eli Bendersky <eliben at gmail.com>
date: Mon Sep 02 17:01:10 2013 -0700
summary:
Remove unused --debug option of regrtest.
If bots fail due to using this flag, the buildbot scripts have to be modified
to omit it. Regrtest ignores it anyway.
files:
Lib/test/regrtest.py | 16 +++++++---------
Lib/test/test_regrtest.py | 6 ------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -252,8 +252,6 @@
help='re-run failed tests in verbose mode')
group.add_argument('-W', '--verbose3', action='store_true',
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',
help='no output unless one or more tests fail')
group.add_argument('-o', '--slow', action='store_true', dest='print_slow',
@@ -442,7 +440,7 @@
(testname, ns.verbose, ns.quiet),
dict(huntrleaks=ns.huntrleaks,
use_resources=ns.use_resources,
- debug=ns.debug, output_on_failure=ns.verbose3,
+ output_on_failure=ns.verbose3,
timeout=ns.timeout, failfast=ns.failfast,
match_tests=ns.match_tests))
# Running the child from the same working directory as regrtest's original
@@ -757,7 +755,7 @@
else:
try:
result = runtest(test, ns.verbose, ns.quiet,
- ns.huntrleaks, ns.debug,
+ ns.huntrleaks,
output_on_failure=ns.verbose3,
timeout=ns.timeout, failfast=ns.failfast,
match_tests=ns.match_tests)
@@ -817,7 +815,7 @@
sys.stdout.flush()
try:
ns.verbose = True
- ok = runtest(test, True, ns.quiet, ns.huntrleaks, ns.debug,
+ ok = runtest(test, True, ns.quiet, ns.huntrleaks,
timeout=ns.timeout)
except KeyboardInterrupt:
# print a newline separate from the ^C
@@ -910,7 +908,7 @@
atexit.register(restore_stdout)
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,
timeout=None):
"""Run a single test.
@@ -964,7 +962,7 @@
sys.stdout = stream
sys.stderr = stream
result = runtest_inner(test, verbose, quiet, huntrleaks,
- debug, display_failure=False)
+ display_failure=False)
if result[0] == FAILED:
output = stream.getvalue()
orig_stderr.write(output)
@@ -974,7 +972,7 @@
sys.stderr = orig_stderr
else:
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)
return result
finally:
@@ -1255,7 +1253,7 @@
def runtest_inner(test, verbose, quiet,
- huntrleaks=False, debug=False, display_failure=True):
+ huntrleaks=False, display_failure=True):
support.unload(test)
test_time = 0.0
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -71,12 +71,6 @@
ns = regrtest._parse_args([opt])
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):
for opt in '-q', '--quiet':
with self.subTest(opt=opt):
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list