jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify _locationline helper

This commit is contained in:
holger krekel 2011-03-08 13:44:53 +01:00
parent 1a7c6ecc42
commit 55657d6c51
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
_pytest/terminal.py
View File

@ -335,19 +335,19 @@ class TerminalReporter:
excrepr.reprcrash.toterminal(self._tw) excrepr.reprcrash.toterminal(self._tw)
def _locationline(self, collect_fspath, fspath, lineno, domain): def _locationline(self, collect_fspath, fspath, lineno, domain):
# collect_fspath comes from testid which has a "/"-normalized path
if fspath and fspath.replace("\\", "/") != collect_fspath: if fspath and fspath.replace("\\", "/") != collect_fspath:
fspath = "%s <- %s" % (collect_fspath, fspath) fspath = "%s <- %s" % (collect_fspath, fspath)
if fspath:
line = str(fspath)
if lineno is not None: if lineno is not None:
lineno += 1 lineno += 1
if fspath and lineno and domain: line += ":" + str(lineno)
line = "%(fspath)s:%(lineno)s: %(domain)s" if domain:
elif fspath and domain: line += ": " + str(domain)
line = "%(fspath)s: %(domain)s"
elif fspath and lineno:
line = "%(fspath)s:%(lineno)s %(extrapath)s"
else: else:
line = "[nolocation]" line = "[location]"
return line % locals() + " " return line + " "
def _getfailureheadline(self, rep): def _getfailureheadline(self, rep):
if hasattr(rep, 'location'): if hasattr(rep, 'location'):