From eb4249322ea84672de410761d0eb112331da9315 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 31 Dec 2009 11:50:01 +0100
Subject: [PATCH] fix xml generation for skipped collections of tests

--HG--
branch : trunk
---
 py/plugin/pytest_logxml.py           | 11 ++++++++++-
 testing/plugin/test_pytest_logxml.py | 15 ++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/py/plugin/pytest_logxml.py b/py/plugin/pytest_logxml.py
index 8c3a432e5..0e12cef3c 100644
--- a/py/plugin/pytest_logxml.py
+++ b/py/plugin/pytest_logxml.py
@@ -76,6 +76,15 @@ class LogXML(object):
         self._closetestcase()
         self.errors += 1
 
+    def append_collect_skipped(self, report):
+        self._opentestcase_collectfailure(report)
+        s = py.xml.escape(str(report.longrepr))
+        #msg = str(report.longrepr.reprtraceback.extraline)
+        self.test_logs.append(
+            '<skipped message="collection skipped">%s</skipped>' % (s))
+        self._closetestcase()
+        self.skipped += 1
+
     def append_error(self, report):
         self._opentestcase(report)
         s = py.xml.escape(str(report.longrepr))
@@ -130,7 +139,7 @@ class LogXML(object):
         logfile = open(self.logfile, 'w', 1) # line buffered
         suite_stop_time = time.time()
         suite_time_delta = suite_stop_time - self.suite_start_time
-        numtests = self.passed + self.skipped + self.failed
+        numtests = self.passed + self.failed
         logfile.write('<testsuite ')
         logfile.write('name="" ')
         logfile.write('errors="%i" ' % self.errors)
diff --git a/testing/plugin/test_pytest_logxml.py b/testing/plugin/test_pytest_logxml.py
index 377cea996..2c2fb0afe 100644
--- a/testing/plugin/test_pytest_logxml.py
+++ b/testing/plugin/test_pytest_logxml.py
@@ -28,7 +28,7 @@ class TestPython:
         result, dom = runandparse(testdir)
         assert result.ret 
         node = dom.getElementsByTagName("testsuite")[0]
-        assert_attr(node, errors=0, failures=1, skips=1, tests=3)
+        assert_attr(node, errors=0, failures=1, skips=1, tests=2)
 
     def test_setup_error(self, testdir):
         testdir.makepyfile("""
@@ -90,6 +90,19 @@ class TestPython:
         assert_attr(fnode, message="collection failure")
         assert "invalid syntax" in fnode.toxml()
 
+    def test_collect_skipped(self, testdir):
+        testdir.makepyfile("import py ; py.test.skip('xyz')")
+        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_collect_error",
+            name="test_collect_skipped")
+        fnode = tnode.getElementsByTagName("skipped")[0]
+        assert_attr(fnode, message="collection skipped")
+
 class TestNonPython:
     def test_summing_simple(self, testdir):
         testdir.makeconftest("""