Added handling of skipped xml entity for the testcase and skipped attribute for the testsuite

Ketouem · Ketouem · commit 840079a874dc · 2013-06-28T20:23:21.000+02:00
diff --git a/junit_xml/__init__.py b/junit_xml/__init__.py
@@ -24,6 +24,11 @@
                 the output of the testcase
             </error>
         </testcase>
+	<testcase classname="package.directory" name="003-skipped-test" time="0">
+	    <skipped message="SKIPPED Test" type="skipped">
+                the output of the testcase
+            </skipped>	
+	</testcase>
         <testcase classname="testdb.directory" name="003-passed-test" time="10">
             <system-out>
                 I am system output
@@ -63,6 +68,7 @@ def build_xml_doc(self):
         test_suite_attributes['name'] = str(self.name)
         test_suite_attributes['failures'] = str(len([c for c in self.test_cases if c.is_failure()]))
         test_suite_attributes['errors'] = str(len([c for c in self.test_cases if c.is_error()]))
+	test_suite_attributes['skipped'] = str(len([c for c in self.test_cases if c.is_skipped()]))
         test_suite_attributes['time'] = str(sum(c.elapsed_sec for c in self.test_cases if c.elapsed_sec))        
         test_suite_attributes['tests'] = str(len(self.test_cases))
 
@@ -115,6 +121,16 @@ def build_xml_doc(self):
                     error_element.text = case.error_output
                 test_case_element.append(error_element)
 
+            # skippeds
+            if case.is_skipped():
+                attrs = {'type': 'skipped'}
+                if case.skipped_message:
+                    attrs['message'] = case.skipped_message
+                skipped_element = ET.Element("skipped", attrs)
+                if case.error_output:
+                    skipped_element.text = case.skipped_output
+                test_case_element.append(skipped_element)
+
             # test stdout
             if case.stdout:
                 stdout_element = ET.Element("system-out")
@@ -187,6 +203,8 @@ def __init__(self, name, classname=None, elapsed_sec=None, stdout=None, stderr=N
         self.error_output = None
         self.failure_message = None
         self.failure_output = None
+        self.skipped_message = None
+        self.skipped_output = None
 
     def add_error_info(self, message=None, output=None):
         """Adds an error message, output, or both to the test case"""
@@ -202,10 +220,21 @@ def add_failure_info(self, message=None, output=None):
         if output:
             self.failure_output = output
 
+    def add_skipped_info(self, message=None, output=None):
+        """Adds a skipped message, output, or both to the test case"""
+        if message:
+            self.skipped_message = message
+        if output:
+            self.skipped_output = output
+
     def is_failure(self):
         """returns true if this test case is a failure"""
         return self.failure_output or self.failure_message
 
     def is_error(self):
         """returns true if this test case is an error"""
         return self.error_output or self.error_message
+
+    def is_skipped(self):
+        """returns true if this test case has been skipped"""
+        return self.skipped_output or self.skipped_message
