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

Merged in wooparadog/pytest (pull request #163) 

Also replace `report.longrepr` with `bin_xml_escape`ed skipreason
This commit is contained in:
holger krekel 2014-07-15 22:17:15 +02:00
parent bc7110931a 0567a8ee77
commit 80ad3fb8ed
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/junitxml.py
View File

@ -163,7 +163,7 @@ class LogXML(object):
if skipreason.startswith("Skipped: "): if skipreason.startswith("Skipped: "):
skipreason = bin_xml_escape(skipreason[9:]) skipreason = bin_xml_escape(skipreason[9:])
self.append( self.append(
Junit.skipped("%s:%s: %s" % report.longrepr, Junit.skipped("%s:%s: %s" % (filename, lineno, skipreason),
type="pytest.skip", type="pytest.skip",
message=skipreason message=skipreason
)) ))

2
testing/test_junitxml.py
View File

@ -494,6 +494,8 @@ def test_unicode_issue368(testdir):
log.append_error(report) log.append_error(report)
report.longrepr = "filename", 1, ustr report.longrepr = "filename", 1, ustr
log.append_skipped(report) log.append_skipped(report)
report.longrepr = "filename", 1, "Skipped: 卡嘣嘣"
log.append_skipped(report)
report.wasxfail = ustr report.wasxfail = ustr
log.append_skipped(report) log.append_skipped(report)
log.pytest_sessionfinish() log.pytest_sessionfinish()