p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge heads

This commit is contained in:
Benjamin Peterson 2011-07-13 13:34:24 -05:00
parent 3cc8697744 703da22831
commit 85415135a4
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/__init__.py
View File

@ -1,2 +1,2 @@
#
__version__ = '2.1.1.dev2'
__version__ = '2.1.1.dev3'

10
_pytest/junitxml.py
View File

@ -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
View File

@ -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'],

6
testing/test_junitxml.py
View File

@ -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):