[py-svn] py-trunk commit 9eb1cef24b56: unify handling of reportcharacters across resultlog/junitxml plugins
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Thu May 20 14:32:15 CEST 2010
# HG changeset patch -- Bitbucket.org
# Project py-trunk
# URL http://bitbucket.org/hpk42/py-trunk/overview
# User holger krekel <holger at merlinux.eu>
# Date 1274358913 -7200
# Node ID 9eb1cef24b56e4f61772da8776025475ca903ac9
# Parent 06a7ad82f24cf06ecb01e7c66796a1b6e0ed5dcc
unify handling of reportcharacters across resultlog/junitxml plugins
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,17 @@ Changes between 1.3.0 and 1.3.1
declarative approach with the @py.test.mark.xfail cannot
be used as it would mark all configurations as xfail.
+- improve and refine letter reporting in the progress bar:
+ . pass
+ f failed test
+ s skipped tests (reminder: use for dependency/platform mismatch only)
+ x xfailed test (test that was expected to fail)
+ X xpassed test (test that was expected to fail but passed)
+
+ You can use any combination of 'fsxX' with the '-r' extended
+ reporting option. The xfail/xpass results will show up as
+ skipped tests in the junitxml output.
+
- make py.test.cmdline.main() return the exitstatus
instead of raising (which is still done by py.cmdline.pytest())
and make it so that py.test.cmdline.main() can be called
--- a/testing/plugin/test_pytest_junitxml.py
+++ b/testing/plugin/test_pytest_junitxml.py
@@ -25,11 +25,17 @@ class TestPython:
assert 0
def test_skip():
py.test.skip("")
+ @py.test.mark.xfail
+ def test_xfail():
+ assert 0
+ @py.test.mark.xfail
+ def test_xpass():
+ assert 1
""")
result, dom = runandparse(testdir)
assert result.ret
node = dom.getElementsByTagName("testsuite")[0]
- assert_attr(node, errors=0, failures=1, skips=1, tests=2)
+ assert_attr(node, errors=0, failures=1, skips=3, tests=2)
def test_setup_error(self, testdir):
testdir.makepyfile("""
@@ -92,6 +98,43 @@ class TestPython:
assert_attr(fnode, message="test failure")
assert "ValueError" in fnode.toxml()
+ def test_xfailure_function(self, testdir):
+ testdir.makepyfile("""
+ import py
+ def test_xfail():
+ py.test.xfail("42")
+ """)
+ result, dom = runandparse(testdir)
+ assert not result.ret
+ node = dom.getElementsByTagName("testsuite")[0]
+ assert_attr(node, skips=1, tests=0)
+ tnode = node.getElementsByTagName("testcase")[0]
+ assert_attr(tnode,
+ classname="test_xfailure_function.test_xfailure_function",
+ name="test_xfail")
+ fnode = tnode.getElementsByTagName("skipped")[0]
+ assert_attr(fnode, message="expected test failure")
+ #assert "ValueError" in fnode.toxml()
+
+ def test_xfailure_xpass(self, testdir):
+ testdir.makepyfile("""
+ import py
+ @py.test.mark.xfail
+ def test_xpass():
+ pass
+ """)
+ result, dom = runandparse(testdir)
+ #assert result.ret
+ node = dom.getElementsByTagName("testsuite")[0]
+ assert_attr(node, skips=1, tests=0)
+ tnode = node.getElementsByTagName("testcase")[0]
+ assert_attr(tnode,
+ classname="test_xfailure_xpass.test_xfailure_xpass",
+ name="test_xpass")
+ fnode = tnode.getElementsByTagName("skipped")[0]
+ assert_attr(fnode, message="xfail-marked test passes unexpectedly")
+ #assert "ValueError" in fnode.toxml()
+
def test_collect_error(self, testdir):
testdir.makepyfile("syntax error")
result, dom = runandparse(testdir)
--- a/py/_plugin/pytest_junitxml.py
+++ b/py/_plugin/pytest_junitxml.py
@@ -56,10 +56,15 @@ class LogXML(object):
def append_failure(self, report):
self._opentestcase(report)
#msg = str(report.longrepr.reprtraceback.extraline)
- self.appendlog('<failure message="test failure">%s</failure>',
- report.longrepr)
+ if "xfail" in report.keywords:
+ self.appendlog(
+ '<skipped message="xfail-marked test passes unexpectedly"/>')
+ self.skipped += 1
+ else:
+ self.appendlog('<failure message="test failure">%s</failure>',
+ report.longrepr)
+ self.failed += 1
self._closetestcase()
- self.failed += 1
def _opentestcase_collectfailure(self, report):
node = report.collector
@@ -95,7 +100,12 @@ class LogXML(object):
def append_skipped(self, report):
self._opentestcase(report)
- self.appendlog("<skipped/>")
+ if "xfail" in report.keywords:
+ self.appendlog(
+ '<skipped message="expected test failure">%s</skipped>',
+ report.keywords['xfail'])
+ else:
+ self.appendlog("<skipped/>")
self._closetestcase()
self.skipped += 1
--- a/py/_plugin/pytest_skipping.py
+++ b/py/_plugin/pytest_skipping.py
@@ -225,7 +225,7 @@ def pytest_report_teststatus(report):
if report.skipped:
return "xfailed", "x", "xfail"
elif report.failed:
- return "xpassed", "P", "XPASS"
+ return "xpassed", "X", "XPASS"
# called by the terminalreporter instance/plugin
def pytest_terminal_summary(terminalreporter):
@@ -242,7 +242,7 @@ def pytest_terminal_summary(terminalrepo
for char in tr.reportchars:
if char == "x":
show_xfailed(terminalreporter, lines)
- elif char == "P":
+ elif char == "X":
show_xpassed(terminalreporter, lines)
elif char == "f":
show_failed(terminalreporter, lines)
--- a/testing/plugin/test_pytest_skipping.py
+++ b/testing/plugin/test_pytest_skipping.py
@@ -162,7 +162,7 @@ class TestXFail:
def test_that():
assert 1
""")
- result = testdir.runpytest(p, '-rP')
+ result = testdir.runpytest(p, '-rX')
result.stdout.fnmatch_lines([
"*XPASS*test_that*",
"*1 xpassed*"
@@ -331,7 +331,7 @@ def test_reportchars(testdir):
def test_4():
py.test.skip("four")
""")
- result = testdir.runpytest("-rfxPs")
+ result = testdir.runpytest("-rfxXs")
result.stdout.fnmatch_lines([
"FAIL*test_1*",
"XFAIL*test_2*",
--- a/py/_plugin/pytest_resultlog.py
+++ b/py/_plugin/pytest_resultlog.py
@@ -73,7 +73,7 @@ class ResultLog(object):
code = report.shortrepr
if code == 'x':
longrepr = str(report.longrepr)
- elif code == 'P':
+ elif code == 'X':
longrepr = ''
elif report.passed:
longrepr = ""
--- a/testing/plugin/test_pytest_resultlog.py
+++ b/testing/plugin/test_pytest_resultlog.py
@@ -126,7 +126,7 @@ class TestWithFunctionIntegration:
tb = "".join(lines[8:14])
assert tb.find('raise ValueError("XFAIL")') != -1
- assert lines[14].startswith('P ')
+ assert lines[14].startswith('X ')
assert len(lines) == 15
def test_internal_exception(self):
More information about the pytest-commit
mailing list