Merged in wooparadog/pytest (pull request #163)

Also replace `report.longrepr` with `bin_xml_escape`ed skipreason

_pytest/junitxml.py

@@ -163,7 +163,7 @@ class LogXML(object):
             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
                 ))

testing/test_junitxml.py

@@ -494,6 +494,8 @@ def test_unicode_issue368(testdir):
     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()