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

Improve item.warn handling of fslocation parameter 

Just pass fslocation forward and let the hook implementer decide what to do with the parameter
This commit is contained in:
Bruno Oliveira 2017-04-13 18:01:24 -03:00
parent d9a2e70155
commit cac82e71d8
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_pytest/main.py
View File

@ -309,9 +309,6 @@ class Node(object):
fslocation = getattr(self, "location", None) fslocation = getattr(self, "location", None)
if fslocation is None: if fslocation is None:
fslocation = getattr(self, "fspath", None) fslocation = getattr(self, "fspath", None)
else:
fslocation = "%s:%s" % (fslocation[0], fslocation[1] + 1)
self.ihook.pytest_logwarning.call_historic(kwargs=dict( self.ihook.pytest_logwarning.call_historic(kwargs=dict(
code=code, message=message, code=code, message=message,
nodeid=self.nodeid, fslocation=fslocation)) nodeid=self.nodeid, fslocation=fslocation))

6
_pytest/terminal.py
View File

@ -109,10 +109,10 @@ class WarningReport(object):
if self.nodeid: if self.nodeid:
return self.nodeid return self.nodeid
if self.fslocation: if self.fslocation:
if isinstance(self.fslocation, tuple) and len(self.fslocation) == 2: if isinstance(self.fslocation, tuple) and len(self.fslocation) >= 2:
filename, linenum = self.fslocation filename, linenum = self.fslocation[:2]
relpath = py.path.local(filename).relto(config.invocation_dir) relpath = py.path.local(filename).relto(config.invocation_dir)
return '%s:%d' % (relpath, linenum) return '%s:%s' % (relpath, linenum)
else: else:
return str(self.fslocation) return str(self.fslocation)
return None return None