robotframework-pabot 4.0.5__tar.gz → 4.0.6__tar.gz

{robotframework_pabot-4.0.5 → robotframework_pabot-4.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotframework-pabot
-Version: 4.0.5
+Version: 4.0.6
 Summary: Parallel test runner for Robot Framework
 Home-page: https://pabot.org
 Download-URL: https://pypi.python.org/pypi/robotframework-pabot

{robotframework_pabot-4.0.5 → robotframework_pabot-4.0.6}/src/pabot/__init__.py

@@ -2,4 +2,4 @@ from __future__ import absolute_import
 
 from .pabotlib import PabotLib
 
-__version__ = "4.0.5"
+__version__ = "4.0.6"

{robotframework_pabot-4.0.5 → robotframework_pabot-4.0.6}/src/pabot/result_merger.py

@@ -35,7 +35,7 @@ from robot.model import SuiteVisitor
 
 
 class ResultMerger(SuiteVisitor):
-    def __init__(self, result, tests_root_name, out_dir, copied_artifacts):
+    def __init__(self, result, tests_root_name, out_dir, copied_artifacts, legacy_output):
         self.root = result.suite
         self.errors = result.errors
         self.current = None
@@ -43,6 +43,7 @@ class ResultMerger(SuiteVisitor):
         self._tests_root_name = tests_root_name
         self._prefix = ""
         self._out_dir = out_dir
+        self.legacy_output = legacy_output
 
         self._patterns = []
         regexp_template = (
@@ -150,6 +151,8 @@ class ResultMerger(SuiteVisitor):
 
     def merge_time(self, suite):
         cur = self.current
+        if ROBOT_VERSION >= "7.0" and not self.legacy_output:
+            cur.elapsed_time = None
         cur.endtime = max([cur.endtime, suite.endtime])
         cur.starttime = min([cur.starttime, suite.starttime])
 
@@ -222,13 +225,14 @@ def merge_groups(
     invalid_xml_callback,
     out_dir,
     copied_artifacts,
+    legacy_output
 ):
     merged = []
     for group in group_by_root(
         results, critical_tags, non_critical_tags, invalid_xml_callback
     ).values():
         base = group[0]
-        merger = ResultMerger(base, tests_root_name, out_dir, copied_artifacts)
+        merger = ResultMerger(base, tests_root_name, out_dir, copied_artifacts, legacy_output)
         for out in group:
             merger.merge(out)
         merged.append(base)
@@ -259,6 +263,7 @@ def merge(
         invalid_xml_callback,
         settings.output_directory,
         copied_artifacts,
+        rebot_options.get('legacyoutput')
     )
     if len(merged) == 1:
         if not merged[0].suite.doc:

{robotframework_pabot-4.0.5 → robotframework_pabot-4.0.6}/src/robotframework_pabot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotframework-pabot
-Version: 4.0.5
+Version: 4.0.6
 Summary: Parallel test runner for Robot Framework
 Home-page: https://pabot.org
 Download-URL: https://pypi.python.org/pypi/robotframework-pabot

robotframework_pabot-4.0.6/tests/test_resultmerger.py

@@ -0,0 +1,126 @@
+import unittest
+import os
+import pabot.result_merger as result_merger
+from robot.result.visitor import ResultVisitor
+from robot import __version__ as ROBOT_VERSION
+
+
+class ResultStats(ResultVisitor):
+    def __init__(self):
+        self.suites = []
+        self.tests = []
+
+    def end_test(self, test):
+        self.tests.append(test.longname)
+
+    def end_suite(self, suite):
+        self.suites.append(suite.longname)
+
+
+class ResultMergerTests(unittest.TestCase):
+    def test_test_level_run_merge(self):
+        result = result_merger.merge(
+            [
+                "tests/outputs/first.xml",
+                "tests/outputs/second.xml",
+                "tests/outputs/third.xml",
+            ],
+            {},
+            "root",
+            [],
+        )
+        visitor = ResultStats()
+        result.visit(visitor)
+        self.assertEqual(["Tmp.Tests", "Tmp"], visitor.suites)
+        self.assertEqual(
+            ["Tmp.Tests.First", "Tmp.Tests.Second", "Tmp.Tests.Third"], visitor.tests
+        )
+
+    def test_suite_level_run_merge(self):
+        result = result_merger.merge(
+            ["tests/outputs/tests.xml", "tests/outputs/tests2.xml"], {}, "root", []
+        )
+        visitor = ResultStats()
+        result.visit(visitor)
+        self.assertEqual(
+            [
+                "Tmp.Tests.First",
+                "Tmp.Tests.Second",
+                "Tmp.Tests.Third",
+                "Tmp.Tests2.First 2",
+                "Tmp.Tests2.Second 2",
+                "Tmp.Tests2.Third 2",
+            ],
+            visitor.tests,
+        )
+        self.assertEqual(["Tmp.Tests", "Tmp.Tests2", "Tmp"], visitor.suites)
+
+    def test_prefixing(self):
+        self.assertEqual(
+            result_merger.prefix(os.path.join("foo", "bar", "zoo", "ba2r.xml")), "zoo"
+        )
+        self.assertEqual(
+            result_merger.prefix(os.path.join("/zoo", "baa", "floo.txt")), "baa"
+        )
+        self.assertEqual(result_merger.prefix(os.path.join("koo", "foo.bar")), "koo")
+        self.assertEqual(result_merger.prefix("hui.txt"), "")
+
+    def test_elapsed_time(self):
+        # output.xml generated based on robotframework >= 7.0 without --legacyoutput option
+        if ROBOT_VERSION >= "7.0":
+            result_1 = result_merger.merge(
+                [
+                    "tests/outputs/output_with_latest_robot/first.xml",
+                    "tests/outputs/output_with_latest_robot/second.xml",
+                    "tests/outputs/output_with_latest_robot/third.xml",
+                ],
+                {},
+                "root",
+                [],
+            )
+            visitor_1 = ResultStats()
+            result_1.visit(visitor_1)
+            self.assertEqual("Tmp", result_1.suite.name)
+            self.assertEqual(1573, result_1.suite.elapsedtime)
+            self.assertEqual("Tests", result_1.suite.suites[0].name)
+            self.assertEqual(1474, result_1.suite.suites[0].elapsedtime)
+
+            # output.xml generated based on robotframework >=7.0 with --legacyoutput option
+            result_2 = result_merger.merge(
+                [
+                    "tests/outputs/first.xml",
+                    "tests/outputs/second.xml",
+                    "tests/outputs/third.xml",
+                ],
+                {'legacyoutput': True},
+                "root",
+                [],
+            )
+            visitor_2 = ResultStats()
+            result_2.visit(visitor_2)
+            self.assertEqual("Tmp", result_2.suite.name)
+            self.assertEqual(1036, result_2.suite.elapsedtime)
+            self.assertEqual("Tests", result_2.suite.suites[0].name)
+            self.assertEqual(1010, result_2.suite.suites[0].elapsedtime)
+        else:
+            # output.xml generated based on robotframework < 7.0
+            result = result_merger.merge(
+                [
+                    "tests/outputs/first.xml",
+                    "tests/outputs/second.xml",
+                    "tests/outputs/third.xml",
+                ],
+                {},
+                "root",
+                [],
+                True
+            )
+            visitor = ResultStats()
+            result.visit(visitor)
+            self.assertEqual("Tmp", result.suite.name)
+            self.assertEqual(1036, result.suite.elapsedtime)
+            self.assertEqual("Tests", result.suite.suites[0].name)
+            self.assertEqual(1010, result.suite.suites[0].elapsedtime)
+
+if __name__ == "__main__":
+    unittest.main()

robotframework_pabot-4.0.5/tests/test_resultmerger.py

@@ -1,73 +0,0 @@
-import unittest
-import time
-import os
-import tempfile
-import shutil
-import random
-import pabot.result_merger as result_merger
-from robot.result.visitor import ResultVisitor
-
-
-class ResultStats(ResultVisitor):
-    def __init__(self):
-        self.suites = []
-        self.tests = []
-
-    def end_test(self, test):
-        self.tests.append(test.longname)
-
-    def end_suite(self, suite):
-        self.suites.append(suite.longname)
-
-
-class ResultMergerTests(unittest.TestCase):
-    def test_test_level_run_merge(self):
-        result = result_merger.merge(
-            [
-                "tests/outputs/first.xml",
-                "tests/outputs/second.xml",
-                "tests/outputs/third.xml",
-            ],
-            {},
-            "root",
-            [],
-        )
-        visitor = ResultStats()
-        result.visit(visitor)
-        self.assertEqual(["Tmp.Tests", "Tmp"], visitor.suites)
-        self.assertEqual(
-            ["Tmp.Tests.First", "Tmp.Tests.Second", "Tmp.Tests.Third"], visitor.tests
-        )
-
-    def test_suite_level_run_merge(self):
-        result = result_merger.merge(
-            ["tests/outputs/tests.xml", "tests/outputs/tests2.xml"], {}, "root", []
-        )
-        visitor = ResultStats()
-        result.visit(visitor)
-        self.assertEqual(
-            [
-                "Tmp.Tests.First",
-                "Tmp.Tests.Second",
-                "Tmp.Tests.Third",
-                "Tmp.Tests2.First 2",
-                "Tmp.Tests2.Second 2",
-                "Tmp.Tests2.Third 2",
-            ],
-            visitor.tests,
-        )
-        self.assertEqual(["Tmp.Tests", "Tmp.Tests2", "Tmp"], visitor.suites)
-
-    def test_prefixing(self):
-        self.assertEqual(
-            result_merger.prefix(os.path.join("foo", "bar", "zoo", "ba2r.xml")), "zoo"
-        )
-        self.assertEqual(
-            result_merger.prefix(os.path.join("/zoo", "baa", "floo.txt")), "baa"
-        )
-        self.assertEqual(result_merger.prefix(os.path.join("koo", "foo.bar")), "koo")
-        self.assertEqual(result_merger.prefix("hui.txt"), "")
-
-
-if __name__ == "__main__":
-    unittest.main()