floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r63197] * don't think "showskipsummary" is a useful option 

* some typo fixes

--HG--
branch : trunk
This commit is contained in:
hpk 2009-03-21 21:20:02 +01:00
parent 422635ea47
commit 9bfdb42273
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
py/test/plugin/pytest_default.py
View File

@ -33,7 +33,7 @@ class DefaultPlugin:
return Directory(path, parent=parent) return Directory(path, parent=parent)
def pytest_addoption(self, parser): def pytest_addoption(self, parser):
group = parser.addgroup("general", "general test process options") group = parser.addgroup("general", "test collection and failure interaction options")
group._addoption('-v', '--verbose', action="count", group._addoption('-v', '--verbose', action="count",
dest="verbose", default=0, help="increase verbosity."), dest="verbose", default=0, help="increase verbosity."),
group._addoption('-x', '--exitfirst', group._addoption('-x', '--exitfirst',
@ -48,26 +48,19 @@ class DefaultPlugin:
group._addoption('-l', '--showlocals', group._addoption('-l', '--showlocals',
action="store_true", dest="showlocals", default=False, action="store_true", dest="showlocals", default=False,
help="show locals in tracebacks (disabled by default).") help="show locals in tracebacks (disabled by default).")
group._addoption('--showskipsummary', #group._addoption('--showskipsummary',
action="store_true", dest="showskipsummary", default=False, # action="store_true", dest="showskipsummary", default=False,
help="always show summary of skipped tests") # help="always show summary of skipped tests")
group._addoption('--pdb', group._addoption('--pdb',
action="store_true", dest="usepdb", default=False, action="store_true", dest="usepdb", default=False,
help="start pdb (the Python debugger) on errors.") help="start pdb (the Python debugger) on errors.")
group._addoption('--tb', group._addoption('--tb', metavar="style",
action="store", dest="tbstyle", default='long', action="store", dest="tbstyle", default='long',
type="choice", choices=['long', 'short', 'no'], type="choice", choices=['long', 'short', 'no'],
help="traceback verboseness (long/short/no).") help="traceback verboseness (long/short/no).")
group._addoption('--fulltrace',
action="store_true", dest="fulltrace", default=False,
help="don't cut any tracebacks (default is to cut).")
group._addoption('-s', group._addoption('-s',
action="store_true", dest="nocapture", default=False, action="store_true", dest="nocapture", default=False,
help="disable catching of stdout/stderr during test run.") help="disable catching of stdout/stderr during test run.")
group._addoption('--iocapture', action="store", default="fd", metavar="method",
help="set iocapturing method: fd|sys|no.")
group.addoption('--basetemp', dest="basetemp", default=None, metavar="dir",
help="temporary directory for this test run.")
group.addoption('--boxed', group.addoption('--boxed',
action="store_true", dest="boxed", default=False, action="store_true", dest="boxed", default=False,
help="box each test run in a separate process") help="box each test run in a separate process")
@ -89,6 +82,14 @@ class DefaultPlugin:
group._addoption('--nomagic', group._addoption('--nomagic',
action="store_true", dest="nomagic", default=False, action="store_true", dest="nomagic", default=False,
help="don't reinterpret asserts, no traceback cutting. ") help="don't reinterpret asserts, no traceback cutting. ")
group._addoption('--fulltrace',
action="store_true", dest="fulltrace", default=False,
help="don't cut any tracebacks (default is to cut).")
group.addoption('--basetemp', dest="basetemp", default=None, metavar="dir",
help="base temporary directory for this test run.")
group._addoption('--iocapture', action="store", default="fd", metavar="method",
type="choice", choices=['fd', 'sys', 'no'],
help="set iocapturing method: fd|sys|no.")
group.addoption('--debug', group.addoption('--debug',
action="store_true", dest="debug", default=False, action="store_true", dest="debug", default=False,
help="generate and show debugging information.") help="generate and show debugging information.")

7
py/test/plugin/pytest_terminal.py
View File

@ -267,7 +267,7 @@ class TerminalReporter:
def summary_skips(self): def summary_skips(self):
if 'skipped' in self.stats: if 'skipped' in self.stats:
if 'failed' not in self.stats or self.config.option.showskipsummary: if 'failed' not in self.stats: # or self.config.option.showskipsummary:
fskips = folded_skips(self.stats['skipped']) fskips = folded_skips(self.stats['skipped'])
if fskips: if fskips:
self.write_sep("_", "skipped test summary") self.write_sep("_", "skipped test summary")
@ -557,7 +557,8 @@ class TestTerminal:
import py; py.test.skip('skip me please!') import py; py.test.skip('skip me please!')
def test_interrupt_me(): def test_interrupt_me():
raise KeyboardInterrupt # simulating the user raise KeyboardInterrupt # simulating the user
""", configargs=("--showskipsummary",) + ("-v",)*verbose) """, configargs=("-v",)*verbose)
#""", configargs=("--showskipsummary",) + ("-v",)*verbose)
rep = TerminalReporter(modcol.config, file=linecomp.stringio) rep = TerminalReporter(modcol.config, file=linecomp.stringio)
modcol.config.bus.register(rep) modcol.config.bus.register(rep)
bus = modcol.config.bus bus = modcol.config.bus
@ -579,7 +580,7 @@ class TestTerminal:
"> assert 0", "> assert 0",
"E assert 0", "E assert 0",
]) ])
assert "Skipped: 'skip me please!'" in text #assert "Skipped: 'skip me please!'" in text
assert "_keyboard_interrupt.py:6: KeyboardInterrupt" in text assert "_keyboard_interrupt.py:6: KeyboardInterrupt" in text
see_details = "raise KeyboardInterrupt # simulating the user" in text see_details = "raise KeyboardInterrupt # simulating the user" in text
assert see_details == verbose assert see_details == verbose