put systemout/systemerr to correct xml location
This commit is contained in:
parent
14ceaf2459
commit
703da22831
|
@ -1,2 +1,2 @@
|
|||
#
|
||||
__version__ = '2.1.1.dev2'
|
||||
__version__ = '2.1.1.dev3'
|
||||
|
|
|
@ -115,15 +115,13 @@ class LogXML(object):
|
|||
self.skipped += 1
|
||||
else:
|
||||
sec = dict(report.sections)
|
||||
fmt = '<failure message="test failure">%s'
|
||||
args = [report.longrepr]
|
||||
self.appendlog('<failure message="test failure">%s</failure>',
|
||||
report.longrepr)
|
||||
for name in ('out', 'err'):
|
||||
content = sec.get("Captured std%s" % name)
|
||||
if content:
|
||||
fmt += "<system-%s>%%s</system-%s>" % (name, name)
|
||||
args.append(content)
|
||||
fmt += "</failure>"
|
||||
self.appendlog(fmt, *args)
|
||||
self.appendlog(
|
||||
"<system-%s>%%s</system-%s>" % (name, name), content)
|
||||
self.failed += 1
|
||||
self._closetestcase()
|
||||
|
||||
|
|
2
setup.py
2
setup.py
|
@ -24,7 +24,7 @@ def main():
|
|||
name='pytest',
|
||||
description='py.test: simple powerful testing with Python',
|
||||
long_description = long_description,
|
||||
version='2.1.1.dev2',
|
||||
version='2.1.1.dev3',
|
||||
url='http://pytest.org',
|
||||
license='MIT license',
|
||||
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
|
||||
|
|
|
@ -150,9 +150,11 @@ class TestPython:
|
|||
fnode = tnode.getElementsByTagName("failure")[0]
|
||||
assert_attr(fnode, message="test failure")
|
||||
assert "ValueError" in fnode.toxml()
|
||||
systemout = fnode.getElementsByTagName("system-out")[0]
|
||||
systemout = fnode.nextSibling
|
||||
assert systemout.tagName == "system-out"
|
||||
assert "hello-stdout" in systemout.toxml()
|
||||
systemerr = fnode.getElementsByTagName("system-err")[0]
|
||||
systemerr = systemout.nextSibling
|
||||
assert systemerr.tagName == "system-err"
|
||||
assert "hello-stderr" in systemerr.toxml()
|
||||
|
||||
def test_failure_escape(self, testdir):
|
||||
|
|
Loading…
Reference in New Issue