Merge lp:~joetalbott/pyjunitxml/add_skipped_count into lp:pyjunitxml

[Joe Talbott]

Add "skipped=" section to results if testcases were skipped.

Fixes: https://bugs.launchpad.net/pyjunitxml/+bug/1243928

Add "skipped=" section to results if testcases were skipped.

Fixes: https://bugs.launchpad.net/pyjunitxml/+bug/1243928

[Vincent Ladeuil (vila)]

As commented on the bug, it seems that skipped tests are supported by the format but nobody ever decided to specify the testsuite attribute.

There is even conflicting implementations that use either 'skips=' or 'skipped='...

[Robert Collins (lifeless)]

Please follow the style of other attributes there - just always include the attribute - much simpler, less to go wrong, and it will let people see what to look for in parsers without having to guess.

review: Needs Fixing

[lp:~joetalbott/pyjunitxml/add_skipped_count]

29. By Joe Talbott on 2013-10-28

Always show skipped testcase summary.

[Joe Talbott (joetalbott)]

review: Needs Resubmitting

Unmerged revisions

29. By Joe Talbott on 2013-10-28

Always show skipped testcase summary.

28. By Joe Talbott on 2013-10-24

Add "skipped=" section to results if testcases were skipped.

=== modified file 'junitxml/__init__.py'
--- junitxml/__init__.py	2011-12-07 16:54:18 +0000
+++ junitxml/__init__.py	2013-10-28 14:04:16 +0000
@@ -165,10 +165,11 @@
         run.
         """
         duration = self._duration(self._run_start)
-        self._stream.write('<testsuite errors="%d" failures="%d" name="" '
-            'tests="%d" time="%0.3f">\n' % (len(self.errors),
+
+        self._stream.write('<testsuite errors="%d" failures="%d"'
+            ' skipped="%d" name="" tests="%d" time="%0.3f">\n' % (len(self.errors),
             len(self.failures) + len(getattr(self, "unexpectedSuccesses", ())),
-            self.testsRun, duration))
+            len(self.skipped), self.testsRun, duration))
         self._stream.write(''.join(self._results))
         self._stream.write('</testsuite>\n')
 
 
=== modified file 'junitxml/tests/test_junitxml.py'
--- junitxml/tests/test_junitxml.py	2011-12-07 16:54:18 +0000
+++ junitxml/tests/test_junitxml.py	2013-10-28 14:04:16 +0000
@@ -66,7 +66,7 @@
         # Lose an hour (peeks inside, a little naughty but not very).
         self.result.time(self.result._run_start - datetime.timedelta(0, 3600))
         self.result.stopTestRun()
-        self.assertEqual("""<testsuite errors="0" failures="0" name="" tests="0" time="0.000">
+        self.assertEqual("""<testsuite errors="0" failures="0" skipped="0" name="" tests="0" time="0.000">
 </testsuite>
 """, self.get_output())
 
@@ -80,7 +80,7 @@
         # When stopTestRun is called, everything is output.
         self.result.startTestRun()
         self.result.stopTestRun()
-        self.assertEqual("""<testsuite errors="0" failures="0" name="" tests="0" time="0.000">
+        self.assertEqual("""<testsuite errors="0" failures="0" skipped="0" name="" tests="0" time="0.000">
 </testsuite>
 """, self.get_output())
 
@@ -115,7 +115,7 @@
         self.result.startTestRun()
         Errors("test_me").run(self.result)
         self.result.stopTestRun()
-        self.assertEqual("""<testsuite errors="1" failures="0" name="" tests="1" time="0.000">
+        self.assertEqual("""<testsuite errors="1" failures="0" skipped="0" name="" tests="1" time="0.000">
 <testcase classname="junitxml.tests.test_junitxml.Errors" name="test_me" time="0.000">
 <error type="ZeroDivisionError">error</error>
 </testcase>
@@ -129,7 +129,7 @@
         self.result.startTestRun()
         Fails("test_me").run(self.result)
         self.result.stopTestRun()
-        self.assertEqual("""<testsuite errors="0" failures="1" name="" tests="1" time="0.000">
+        self.assertEqual("""<testsuite errors="0" failures="1" skipped="0" name="" tests="1" time="0.000">
 <testcase classname="junitxml.tests.test_junitxml.Fails" name="test_me" time="0.000">
 <failure type="AssertionError">failure</failure>
 </testcase>
@@ -143,7 +143,7 @@
         self.result.startTestRun()
         Passes("test_me").run(self.result)
         self.result.stopTestRun()
-        self.assertEqual("""<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
+        self.assertEqual("""<testsuite errors="0" failures="0" skipped="0" name="" tests="1" time="0.000">
 <testcase classname="junitxml.tests.test_junitxml.Passes" name="test_me" time="0.000"/>
 </testsuite>
 """, self.get_output())
@@ -157,7 +157,7 @@
         self.run_test_or_simulate(test, 'skipTest', self.result.addSkip, 'yo')
         self.result.stopTestRun()
         output = self.get_output()
-        expected = """<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
+        expected = """<testsuite errors="0" failures="0" skipped="1" name="" tests="1" time="0.000">
 <testcase classname="junitxml.tests.test_junitxml.Skips" name="test_me" time="0.000">
 <skipped>yo</skipped>
 </testcase>
@@ -177,13 +177,13 @@
         Succeeds("test_me").run(self.result)
         self.result.stopTestRun()
         output = self.get_output()
-        expected = """<testsuite errors="0" failures="1" name="" tests="1" time="0.000">
+        expected = """<testsuite errors="0" failures="1" skipped="0" name="" tests="1" time="0.000">
 <testcase classname="junitxml.tests.test_junitxml.Succeeds" name="test_me" time="0.000">
 <failure type="unittest.case._UnexpectedSuccess"/>
 </testcase>
 </testsuite>
 """
-        expected_old = """<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
+        expected_old = """<testsuite errors="0" failures="0" skipped="0" name="" tests="1" time="0.000">
 <testcase classname="junitxml.tests.test_junitxml.Succeeds" name="test_me" time="0.000"/>
 </testsuite>
 """
@@ -204,11 +204,11 @@
         ExpectedFail("test_me").run(self.result)
         self.result.stopTestRun()
         output = self.get_output()
-        expected = """<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
+        expected = """<testsuite errors="0" failures="0" skipped="0" name="" tests="1" time="0.000">
 <testcase classname="junitxml.tests.test_junitxml.ExpectedFail" name="test_me" time="0.000"/>
 </testsuite>
 """
-        expected_old = """<testsuite errors="0" failures="1" name="" tests="1" time="0.000">
+        expected_old = """<testsuite errors="0" failures="1" skipped="0" name="" tests="1" time="0.000">
 <testcase classname="junitxml.tests.test_junitxml.ExpectedFail" name="test_me" time="0.000">
 <failure type="AssertionError">failure</failure>
 </testcase>