# HG changeset patch -- Bitbucket.org
# Project pytest
# URL http://bitbucket.org/hpk42/pytest/overview
# User holger krekel <hol...@merlinux.eu>
# Date 1289687618 -3600
# Node ID 8295dc9f529f957ad5e552d575b55bf36e2dbf91
# Parent 057049589d52958d8561f45d88264ab3622ff70f
perform represenation of short paths at test execution site
--- a/_pytest/session.py
+++ b/_pytest/session.py
@@ -317,7 +317,8 @@ class Item(Node):
return self._location
except AttributeError:
location = self.reportinfo()
- location = (str(location[0]), location[1], str(location[2]))
+ fspath = self.session.fspath.bestrelpath(location[0])
+ location = (fspath, location[1], str(location[2]))
self._location = location
return location
--- a/_pytest/terminal.py
+++ b/_pytest/terminal.py
@@ -266,11 +266,7 @@ class TerminalReporter:
def _locationline(self, collect_fspath, fspath, lineno, domain):
if fspath and fspath != collect_fspath:
- fspath = "%s <- %s" % (
- self.curdir.bestrelpath(py.path.local(collect_fspath)),
- self.curdir.bestrelpath(py.path.local(fspath)))
- elif fspath:
- fspath = self.curdir.bestrelpath(py.path.local(fspath))
+ fspath = "%s <- %s" % (collect_fspath, fspath)
if lineno is not None:
lineno += 1
if fspath and lineno and domain:
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
