robotframework-pabot 4.0.4__py3-none-any.whl → 4.0.6__py3-none-any.whl

pabot/__init__.py

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

pabot/pabot.py

@@ -1197,13 +1197,16 @@ def generate_suite_names_with_builder(outs_dir, datasources, options):
         )
 
     suite = builder.build(*datasources)
-    settings.rpa = builder.rpa
-    suite.configure(**settings.suite_config)
+
     if settings.pre_run_modifiers:
         _write.error = _write.warn = _write.info = _write.debug = _write.trace = _write
         suite.visit(
             ModelModifier(settings.pre_run_modifiers, settings.run_empty_suite, _write)
         )
+
+    settings.rpa = builder.rpa
+    suite.configure(**settings.suite_config)
+
     all_suites = (
         get_all_suites_from_main_suite(suite.suites) if suite.suites else [suite]
     )

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.4.dist-info → robotframework_pabot-4.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotframework-pabot
-Version: 4.0.4
+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.4.dist-info → robotframework_pabot-4.0.6.dist-info}/RECORD

@@ -1,12 +1,12 @@
 pabot/SharedLibrary.py,sha256=mIipGs3ZhKYEakKprcbrMI4P_Un6qI8gE7086xpHaLY,2552
-pabot/__init__.py,sha256=jjZbGiQ4mD-1PiHSWFPP1tnabmVkoFjUPxOGCQdECEc,94
+pabot/__init__.py,sha256=elJbj_En-artFbF8FUbxiP7LhJwfmeOz_G2a4FTLO8c,94
 pabot/arguments.py,sha256=PQuJiRYwkfhzbQLat4rOflfAvDONuBAWhu1SOmVV858,7149
 pabot/clientwrapper.py,sha256=yz7battGs0exysnDeLDWJuzpb2Q-qSjitwxZMO2TlJw,231
 pabot/coordinatorwrapper.py,sha256=nQQ7IowD6c246y8y9nsx0HZbt8vS2XODhPVDjm-lyi0,195
 pabot/execution_items.py,sha256=ktPoGx0yXK6Q_4A8CYW3OFCnCyZQnJb8cPYZULmwyAU,8320
-pabot/pabot.py,sha256=gillkewfdWLPksABZ3ooJPJAmGLSRq0o2SCIxfEiI08,68692
+pabot/pabot.py,sha256=QPzClIudUFWZIMRkWjiqGFFVDBXP-40bWUG5PbjJaX4,68695
 pabot/pabotlib.py,sha256=FRZKaKy1ybyRkE-0SpaCsUWzxZAzNNU5dAywSm1QoPk,22324
-pabot/result_merger.py,sha256=0LJN5AhgbaXW0OSCvygYvhxY3eOwYp5GntTjLASqsu8,8864
+pabot/result_merger.py,sha256=8iIptBn5MdgiW-OdhwVR2DZ0hUYuQeQXwIHAEPkMTuw,9095
 pabot/robotremoteserver.py,sha256=L3O2QRKSGSE4ux5M1ip5XJMaelqaxQWJxd9wLLdtpzM,22272
 pabot/workerwrapper.py,sha256=BdELUVDs5BmEkdNBcYTlnP22Cj0tUpZEunYQMAKyKWU,185
 pabot/py3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -14,9 +14,9 @@ pabot/py3/client.py,sha256=Od9L4vZ0sozMHq_W_ITQHBBt8kAej40DG58wnxmbHGM,1434
 pabot/py3/coordinator.py,sha256=kBshCzA_1QX_f0WNk42QBJyDYSwSlNM-UEBxOReOj6E,2313
 pabot/py3/messages.py,sha256=7mFr4_0x1JHm5sW8TvKq28Xs_JoeIGku2bX7AyO0kng,2557
 pabot/py3/worker.py,sha256=5rfp4ZiW6gf8GRz6eC0-KUkfx847A91lVtRYpLAv2sg,1612
-robotframework_pabot-4.0.4.dist-info/LICENSE.txt,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-robotframework_pabot-4.0.4.dist-info/METADATA,sha256=0jHKXbl9oKLtKhHi0bOoTWvMfrrIa_eXK6ggemb8xfc,997
-robotframework_pabot-4.0.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-robotframework_pabot-4.0.4.dist-info/entry_points.txt,sha256=JpAIFADTeFOQWdwmn56KpAil8V3-41ZC5ICXCYm3Ng0,43
-robotframework_pabot-4.0.4.dist-info/top_level.txt,sha256=t3OwfEAsSxyxrhjy_GCJYHKbV_X6AIsgeLhYeHvObG4,6
-robotframework_pabot-4.0.4.dist-info/RECORD,,
+robotframework_pabot-4.0.6.dist-info/LICENSE.txt,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+robotframework_pabot-4.0.6.dist-info/METADATA,sha256=jsSx4f-wusBvzPDEXAJzRkEmhGTkpSxbHJi7EuGJR9k,997
+robotframework_pabot-4.0.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+robotframework_pabot-4.0.6.dist-info/entry_points.txt,sha256=JpAIFADTeFOQWdwmn56KpAil8V3-41ZC5ICXCYm3Ng0,43
+robotframework_pabot-4.0.6.dist-info/top_level.txt,sha256=t3OwfEAsSxyxrhjy_GCJYHKbV_X6AIsgeLhYeHvObG4,6
+robotframework_pabot-4.0.6.dist-info/RECORD,,