[Pytest-commit] commit/pytest: hpk42: Merged in wooparadog/pytest (pull request #163)

[commits-noreply at bitbucket.org]

1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/bc61fe662fa3/
Changeset:   bc61fe662fa3
User:        hpk42
Date:        2014-07-15 22:17:15
Summary:     Merged in wooparadog/pytest (pull request #163)

Also replace `report.longrepr` with `bin_xml_escape`ed skipreason
Affected #:  2 files

diff -r 2bc0f17141418719af8808f25bcd24d70baa0f03 -r bc61fe662fa32521eab0b6f2c4ca427bdac0cd1f _pytest/junitxml.py
--- a/_pytest/junitxml.py
+++ b/_pytest/junitxml.py
@@ -163,7 +163,7 @@
             if skipreason.startswith("Skipped: "):
                 skipreason = bin_xml_escape(skipreason[9:])
             self.append(
-                Junit.skipped("%s:%s: %s" % report.longrepr,
+                Junit.skipped("%s:%s: %s" % (filename, lineno, skipreason),
                               type="pytest.skip",
                               message=skipreason
                 ))

diff -r 2bc0f17141418719af8808f25bcd24d70baa0f03 -r bc61fe662fa32521eab0b6f2c4ca427bdac0cd1f testing/test_junitxml.py
--- a/testing/test_junitxml.py
+++ b/testing/test_junitxml.py
@@ -494,6 +494,8 @@
     log.append_error(report)
     report.longrepr = "filename", 1, ustr
     log.append_skipped(report)
+    report.longrepr = "filename", 1, "Skipped: 卡嘣嘣"
+    log.append_skipped(report)
     report.wasxfail = ustr
     log.append_skipped(report)
     log.pytest_sessionfinish()

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.