junitparser 3.1.2__tar.gz → 3.2.0__tar.gz

{junitparser-3.1.2 → junitparser-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junitparser
-Version: 3.1.2
+Version: 3.2.0
 Summary: Manipulates JUnit/xUnit Result XML files
 Home-page: https://github.com/weiwei/junitparser
 Author: Weiwei Wang

{junitparser-3.1.2 → junitparser-3.2.0}/junitparser/__init__.py

@@ -14,4 +14,4 @@ from .junitparser import (
     FloatAttr,
 )
 
-version = "3.1.2"
+version = "3.2.0"

{junitparser-3.1.2 → junitparser-3.2.0}/junitparser/junitparser.py

@@ -8,10 +8,9 @@ This, according to the document, is Apache Ant's JUnit output.
 
 See the documentation for other supported schemas.
 """
-
 import itertools
 from copy import deepcopy
-from typing import List
+from typing import List, Union
 
 try:
     from lxml import etree
@@ -364,14 +363,17 @@ class TestCase(Element):
         return results
 
     @result.setter
-    def result(self, value: Result):
+    def result(self, value: Union[Result, List[Result]]):
         # First remove all existing results
         for entry in self.result:
             if any(isinstance(entry, r) for r in POSSIBLE_RESULTS):
                 self.remove(entry)
-        for entry in value:
-            if any(isinstance(entry, r) for r in POSSIBLE_RESULTS):
-                self.append(entry)
+        if isinstance(value, Result):
+            self.append(value)
+        elif isinstance(value, list):
+            for entry in value:
+                if any(isinstance(entry, r) for r in POSSIBLE_RESULTS):
+                    self.append(entry)
 
     @property
     def system_out(self):
@@ -665,6 +667,8 @@ class JUnitXml(Element):
     errors = IntAttr()
     skipped = IntAttr()
 
+    testsuite = TestSuite
+
     def __init__(self, name=None):
         super().__init__(self._tag)
         self.filepath = None
@@ -729,7 +733,7 @@ class JUnitXml(Element):
         if root_elem.tag == "testsuites":
             instance = cls()
         elif root_elem.tag == "testsuite":
-            instance = TestSuite()
+            instance = cls.testsuite()
         else:
             raise JUnitXmlError("Invalid format.")
         instance._elem = root_elem

{junitparser-3.1.2 → junitparser-3.2.0}/junitparser/xunit2.py

@@ -19,26 +19,6 @@ from . import junitparser
 T = TypeVar("T")
 
 
-class JUnitXml(junitparser.JUnitXml):
-    # Pytest and xunit schema doesn't have "skipped" in testsuites
-    skipped = None
-
-    def update_statistics(self):
-        """Update test count, time, etc."""
-        time = 0
-        tests = failures = errors = 0
-        for suite in self:
-            suite.update_statistics()
-            tests += suite.tests
-            failures += suite.failures
-            errors += suite.errors
-            time += suite.time
-        self.tests = tests
-        self.failures = failures
-        self.errors = errors
-        self.time = round(time, 3)
-
-
 class TestSuite(junitparser.TestSuite):
     """TestSuite for Pytest, with some different attributes."""
 
@@ -93,6 +73,28 @@ class TestSuite(junitparser.TestSuite):
             self.append(err)
 
 
+class JUnitXml(junitparser.JUnitXml):
+    # Pytest and xunit schema doesn't have "skipped" in testsuites
+    skipped = None
+
+    testsuite = TestSuite
+
+    def update_statistics(self):
+        """Update test count, time, etc."""
+        time = 0
+        tests = failures = errors = 0
+        for suite in self:
+            suite.update_statistics()
+            tests += suite.tests
+            failures += suite.failures
+            errors += suite.errors
+            time += suite.time
+        self.tests = tests
+        self.failures = failures
+        self.errors = errors
+        self.time = round(time, 3)
+
+
 class StackTrace(junitparser.System):
     _tag = "stackTrace"
 

{junitparser-3.1.2 → junitparser-3.2.0}/junitparser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junitparser
-Version: 3.1.2
+Version: 3.2.0
 Summary: Manipulates JUnit/xUnit Result XML files
 Home-page: https://github.com/weiwei/junitparser
 Author: Weiwei Wang

{junitparser-3.1.2 → junitparser-3.2.0}/tests/test_general.py

@@ -578,7 +578,8 @@ class Test_TestCase:
 
     def test_update_results(self):
         case = TestCase()
-        case.result = [Skipped()]
+        case.result = Skipped()
+        assert len(case.result) == 1
         case.result = [Failure(), Skipped()]
         assert len(case.result) == 2
 

{junitparser-3.1.2 → junitparser-3.2.0}/tests/test_xunit2.py

@@ -101,3 +101,14 @@ class Test_JUnitXml:
         assert xml.skipped is None
         assert xml.tostring().count(b"errors") == 2
         assert xml.tostring().count(b"skipped") == 1
+
+    def test_fromstring(self):
+        text = """<testsuite name="suite name">
+         <testcase name="test name 1"/>
+         <testcase name="test name 2"/>
+        </testsuite>"""
+        suite = JUnitXml.fromstring(text)
+        assert isinstance(suite, TestSuite)
+        assert suite.name == "suite name"
+        assert len(list(suite)) == 2
+        assert [test.name for test in suite] == ["test name 1", "test name 2"]