☠☠ backed out by 269bd7e1444e ☠ ☠ | |
author | Gregory Szorc <gps@mozilla.com> |
Mon, 27 Feb 2012 16:15:59 -0800 (2012-02-28) | |
changeset 87887 | 88d02a07d3906e4b790d8de26ed62d2643b9ae68 |
parent 87886 | 7db039c3f3e26c463671c8d2e4e22cb2266b9bd6 |
child 87888 | 9a3da4d27d13ef51337424e71179d56bf117f81a |
push id | 22160 |
push user | mbrubeck@mozilla.com |
push date | Tue, 28 Feb 2012 17:21:33 +0000 (2012-02-28) |
treeherder | mozilla-central@dde4e0089a18 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | tigerblood |
bugs | 725478 |
milestone | 13.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/testing/xpcshell/runxpcshelltests.py +++ b/testing/xpcshell/runxpcshelltests.py @@ -458,20 +458,24 @@ class XPCShellTests(object): # It appears most tools expect the time attribute to be present. testcase.setAttribute("time", "0") if "failure" in result: failure = doc.createElement("failure") failure.setAttribute("type", str(result["failure"]["type"])) failure.setAttribute("message", result["failure"]["message"]) - # Lossy translation but required to not break CDATA. + # Lossy translation but required to not break CDATA. Also, text could + # be None and Python 2.5's minidom doesn't accept None. Later versions + # do, however. cdata = result["failure"]["text"] - if cdata is not None: - cdata = cdata.replace("]]>", "]] >") + if not isinstance(cdata, str): + cdata = "" + + cdata = cdata.replace("]]>", "]] >") text = doc.createCDATASection(cdata) failure.appendChild(text) testcase.appendChild(failure) if result.get("skipped", None): e = doc.createElement("skipped") testcase.appendChild(e)