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

[svn r58091] Minor refactoring of a few methods. The point is to add a couple of 

hooks for my conftest.  This is a bit hard to test, and I don't even
know if it's worth a comment, as I'm ready to fix my conftest when
needed.

--HG--
branch : trunk
This commit is contained in:
arigo 2008-09-12 21:31:31 +02:00
parent 2742204d67
commit a9c4c9876c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
py/test/report/terminal.py
View File

@ -48,12 +48,21 @@ class TerminalReporter(BaseReporter):
self.ensure_newline() self.ensure_newline()
self._tw.sep(sep, title, **markup) self._tw.sep(sep, title, **markup)
def getoutcomeletter(self, item):
return item.outcome.shortrepr
def getoutcomeword(self, item): def getoutcomeword(self, item):
if item.passed: return self._tw.markup("PASS", green=True) if item.passed: return self._tw.markup("PASS", green=True)
elif item.failed: return self._tw.markup("FAIL", red=True) elif item.failed: return self._tw.markup("FAIL", red=True)
elif item.skipped: return "SKIP" elif item.skipped: return "SKIP"
else: return self._tw.markup("???", red=True) else: return self._tw.markup("???", red=True)
def getcollectoutcome(self, item):
if item.skipped:
return str(item.outcome.longrepr.message)
else:
return str(item.outcome.longrepr.reprcrash.message)
def rep_InternalException(self, ev): def rep_InternalException(self, ev):
for line in str(ev.repr).split("\n"): for line in str(ev.repr).split("\n"):
self.write_line("InternalException: " + line) self.write_line("InternalException: " + line)
@ -93,7 +102,7 @@ class TerminalReporter(BaseReporter):
super(TerminalReporter, self).rep_ItemTestReport(ev) super(TerminalReporter, self).rep_ItemTestReport(ev)
fspath = ev.colitem.fspath fspath = ev.colitem.fspath
if not self.config.option.verbose: if not self.config.option.verbose:
self.write_fspath_result(fspath, ev.outcome.shortrepr) self.write_fspath_result(fspath, self.getoutcomeletter(ev))
else: else:
info = ev.colitem.repr_metainfo() info = ev.colitem.repr_metainfo()
line = info.verboseline(basedir=self.curdir) + " " line = info.verboseline(basedir=self.curdir) + " "
@ -104,11 +113,8 @@ class TerminalReporter(BaseReporter):
super(TerminalReporter, self).rep_CollectionReport(ev) super(TerminalReporter, self).rep_CollectionReport(ev)
fspath = ev.colitem.fspath fspath = ev.colitem.fspath
if ev.failed or ev.skipped: if ev.failed or ev.skipped:
if ev.skipped: msg = self.getcollectoutcome(ev)
msg = ev.outcome.longrepr.message self.write_fspath_result(fspath, "- " + msg)
else:
msg = ev.outcome.longrepr.reprcrash.message
self.write_fspath_result(fspath, "- " + str(msg))
def rep_TestrunStart(self, ev): def rep_TestrunStart(self, ev):
super(TerminalReporter, self).rep_TestrunStart(ev) super(TerminalReporter, self).rep_TestrunStart(ev)