Merge lp:~elopio/pyjunitxml/skip into lp:pyjunitxml

[Leo Arias]

Replace 'skip' by 'skipped' in the xml file, as it seems to be the standard tag.

Our Jenkins tests were not reporting the skipped tests. After searching a specification for the results file, I found nothing but it seemed that it was based on the report made by the ant task, and it uses 'skipped' as the tag, instead of the 'skip' that's being generated by junitxml.

I tried replacing the tag by 'skipped', and Jenkins successfully reported the skipped tests.

So, this branch replaces 'skip' by 'skipped', as it seems to be the standard tag.

=== modified file 'junitxml/__init__.py'
--- junitxml/__init__.py	2010-09-11 22:36:30 +0000
+++ junitxml/__init__.py	2011-11-18 18:56:25 +0000
@@ -198,7 +198,7 @@
             pass
         self._test_case_string(test)
         self._results.append('>\n')
-        self._results.append('<skip>%s</skip>\n</testcase>\n'% _escape_attr(reason))
+        self._results.append('<skipped>%s</skipped>\n</testcase>\n'% _escape_attr(reason))
 
     def addUnexpectedSuccess(self, test):
         try:

=== modified file 'junitxml/tests/test_junitxml.py'
--- junitxml/tests/test_junitxml.py	2010-09-11 22:32:51 +0000
+++ junitxml/tests/test_junitxml.py	2011-11-18 18:56:25 +0000
@@ -155,7 +155,7 @@
         output = self.get_output()
         expected = """<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
 <testcase classname="junitxml.tests.test_junitxml.Skips" name="test_me" time="0.000">
-<skip>yo</skip>
+<skipped>yo</skipped>
 </testcase>
 </testsuite>
 """
@@ -262,7 +262,7 @@
         doc = self._run_and_parse_test(SkipWithLt())
         if self.has_skip:
             self.assertEqual('2.7 <= version',
-                doc.getElementsByTagName("skip")[0].firstChild.nodeValue)
+                doc.getElementsByTagName("skipped")[0].firstChild.nodeValue)
         else:
             self.assertTrue(
                 doc.getElementsByTagName("failure")[0].firstChild.nodeValue