robotframework-pabot 2.14.0__tar.gz → 2.16.0__tar.gz

{robotframework-pabot-2.14.0 → robotframework-pabot-2.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotframework-pabot
-Version: 2.14.0
+Version: 2.16.0
 Summary: Parallel test runner for Robot Framework
 Home-page: https://pabot.org
 Author: Mikko Korpela

{robotframework-pabot-2.14.0 → robotframework-pabot-2.16.0}/README.md

@@ -57,6 +57,7 @@ There are several ways you can help in improving this tool:
 
     pabot [--verbose|--testlevelsplit|--command .. --end-command|
            --processes num|--pabotlib|--pabotlibhost host|--pabotlibport port|
+           --processtimeout num|
            --shard i/n|
            --artifacts extensions|--artifactsinsubfolders|
            --resourcefile file|--argumentfile[num] file|--suitesfrom file] 
@@ -100,6 +101,9 @@ Supports all [Robot Framework command line options](https://robotframework.org/r
   Port number of the PabotLib remote server (default is 8270)
   See --pabotlibhost for more information
 
+--processtimeout   [TIMEOUT]          
+  Maximum time in seconds to wait for a process before killing it. If not set, there's no timeout.
+
 --resourcefile   [FILEPATH]          
   Indicator for a file that can contain shared variables for distributing resources. This needs to be used together with pabotlib option. Resource file syntax is same as Windows ini files. Where a section is a shared set of variables.
   

{robotframework-pabot-2.14.0 → robotframework-pabot-2.16.0}/src/pabot/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 
 from .pabotlib import PabotLib
-__version__ = "2.14.0"
+__version__ = "2.16.0"

{robotframework-pabot-2.14.0 → robotframework-pabot-2.16.0}/src/pabot/arguments.py

@@ -72,6 +72,7 @@ def _parse_pabot_args(args):  # type: (List[str]) -> Tuple[List[str], Dict[str,
         "pabotlibhost": "127.0.0.1",
         "pabotlibport": 8270,
         "processes": _processes_count(),
+        "processtimeout": None,
         "artifacts": ["png"],
         "artifactsinsubfolders": False,
         "shardindex": 0,
@@ -93,6 +94,7 @@ def _parse_pabot_args(args):  # type: (List[str]) -> Tuple[List[str], Dict[str,
                 "pabotlib",
                 "pabotlibhost",
                 "pabotlibport",
+                "processtimeout",
                 "ordering",
                 "suitesfrom",
                 "artifacts",
@@ -149,6 +151,10 @@ def _parse_pabot_args(args):  # type: (List[str]) -> Tuple[List[str], Dict[str,
             pabot_args["pabotlibport"] = int(args[1])
             args = args[2:]
             continue
+        if args[0] == "--processtimeout":
+            pabot_args["processtimeout"] = int(args[1])
+            args = args[2:]
+            continue
         if args[0] == "--suitesfrom":
             pabot_args["suitesfrom"] = args[1]
             args = args[2:]

{robotframework-pabot-2.14.0 → robotframework-pabot-2.16.0}/src/pabot/pabot.py

@@ -54,6 +54,9 @@ options (these must be before normal RF options):
 --pabotlibport [PORT]
   Port number of the PabotLib remote server (default is 8270)
 
+--processtimeout [TIMEOUT]
+  Maximum time in seconds to wait for a process before killing it. If not set, there's no timeout.
+
 --ordering [FILE PATH]
   Optionally give execution order from a file.
 
@@ -229,6 +232,7 @@ def execute_and_wait_with(item):
                 caller_id,
                 item.index,
                 item.execution_item.type != "test",
+                process_timeout=item.timeout
             )
         outputxml_preprocessing(
             item.options, outs_dir, name, item.verbose, _make_id(), caller_id
@@ -286,8 +290,9 @@ def _try_execute_and_wait(
     caller_id,
     my_index=-1,
     show_stdout_on_failure=False,
+    process_timeout=None
 ):
-    # type: (List[str], str, str, bool, int, str, int, bool) -> None
+    # type: (List[str], str, str, bool, int, str, int, bool, Optional[int]) -> None
     plib = None
     is_ignored = False
     if _pabotlib_in_use():
@@ -296,7 +301,7 @@ def _try_execute_and_wait(
         with open(os.path.join(outs_dir, cmd[0] + "_stdout.out"), "w") as stdout:
             with open(os.path.join(outs_dir, cmd[0] + "_stderr.out"), "w") as stderr:
                 process, (rc, elapsed) = _run(
-                    cmd, stderr, stdout, item_name, verbose, pool_id, my_index, outs_dir
+                    cmd, stderr, stdout, item_name, verbose, pool_id, my_index, outs_dir, process_timeout
                 )
     except:
         _write(traceback.format_exc())
@@ -469,8 +474,8 @@ def _increase_completed(plib, my_index):
             )
 
 
-def _run(command, stderr, stdout, item_name, verbose, pool_id, item_index, outs_dir):
-    # type: (List[str], IO[Any], IO[Any], str, bool, int, int, str) -> Tuple[Union[subprocess.Popen[bytes], subprocess.Popen], Tuple[int, float]]
+def _run(command, stderr, stdout, item_name, verbose, pool_id, item_index, outs_dir, process_timeout):
+    # type: (List[str], IO[Any], IO[Any], str, bool, int, int, str, Optional[int]) -> Tuple[Union[subprocess.Popen[bytes], subprocess.Popen], Tuple[int, float]]
     timestamp = datetime.datetime.now()
     cmd = " ".join(command)
     if PY2:
@@ -498,10 +503,10 @@ def _run(command, stderr, stdout, item_name, verbose, pool_id, item_index, outs_
             "EXECUTING %s" % item_name,
             timestamp=timestamp,
         )
-    return process, _wait_for_return_code(process, item_name, pool_id, item_index)
+    return process, _wait_for_return_code(process, item_name, pool_id, item_index, process_timeout)
 
 
-def _wait_for_return_code(process, item_name, pool_id, item_index):
+def _wait_for_return_code(process, item_name, pool_id, item_index, process_timeout):
     rc = None
     elapsed = 0
     ping_time = ping_interval = 150
@@ -509,6 +514,19 @@ def _wait_for_return_code(process, item_name, pool_id, item_index):
         rc = process.poll()
         time.sleep(0.1)
         elapsed += 1
+
+        if process_timeout and elapsed / 10.0 >= process_timeout:
+            process.terminate()
+            process.wait()
+            rc = -1  # Set a return code indicating that the process was killed due to timeout
+            _write_with_id(
+                process,
+                pool_id,
+                item_index,
+                "Process %s killed due to exceeding the maximum timeout of %s seconds" % (item_name, process_timeout),
+            )
+            break
+
         if elapsed == ping_time:
             ping_interval += 50
             ping_time += ping_interval
@@ -518,9 +536,11 @@ def _wait_for_return_code(process, item_name, pool_id, item_index):
                 item_index,
                 "still running %s after %s seconds" % (item_name, elapsed / 10.0),
             )
+
     return rc, elapsed / 10.0
 
 
+
 def _read_file(file_handle):
     try:
         with open(file_handle.name, "r") as content_file:
@@ -1238,6 +1258,7 @@ def _options_for_rebot(options, start_time_string, end_time_string):
         "maxassignlength",
         "maxerrorlines",
         "monitorcolors",
+        "parser",
         "prerunmodifier",
         "quiet",
         "randomize",
@@ -1617,8 +1638,9 @@ class QueueItem(object):
         argfile,
         hive=None,
         processes=0,
+        timeout=None
     ):
-        # type: (List[str], str, Dict[str, object], ExecutionItem, List[str], bool, Tuple[str, Optional[str]], Optional[str], int) -> None
+        # type: (List[str], str, Dict[str, object], ExecutionItem, List[str], bool, Tuple[str, Optional[str]], Optional[str], int, Optional[int]) -> None
         self.datasources = datasources
         self.outs_dir = (
             outs_dir.encode("utf-8") if PY2 and is_unicode(outs_dir) else outs_dir
@@ -1636,6 +1658,7 @@ class QueueItem(object):
         self.last_level = None
         self.hive = hive
         self.processes = processes
+        self.timeout = timeout
 
     @property
     def index(self):
@@ -1713,6 +1736,7 @@ def _create_items(datasources, opts_for_run, outs_dir, pabot_args, suite_group):
             argfile,
             pabot_args.get("hive"),
             pabot_args["processes"],
+            pabot_args["processtimeout"]
         )
         for suite in suite_group
         for argfile in pabot_args["argumentfiles"] or [("", None)]
@@ -1757,6 +1781,7 @@ def _chunk_items(items, chunk_size):
             base_item.verbose,
             (base_item.argfile_index, base_item.argfile),
             processes=base_item.processes,
+            timeout=base_item.timeout
         )
         yield chunked_item
 
@@ -1836,6 +1861,7 @@ def _get_dynamically_created_execution_items(
             ("", None),
             pabot_args.get("hive"),
             pabot_args["processes"],
+            pabot_args["processtimeout"]
         )
         for suite in suite_group
     ]

{robotframework-pabot-2.14.0 → robotframework-pabot-2.16.0}/src/pabot/result_merger.py

@@ -56,7 +56,7 @@ class ResultMerger(SuiteVisitor):
         try:
             self._set_prefix(merged.source)
             merged.suite.visit(self)
-            self.root.metadata._add_initial(merged.suite.metadata)
+            self.root.metadata.update(merged.suite.metadata)
             if self.errors != merged.errors:
                 self.errors.add(merged.errors)
         except:

{robotframework-pabot-2.14.0 → robotframework-pabot-2.16.0}/src/robotframework_pabot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotframework-pabot
-Version: 2.14.0
+Version: 2.16.0
 Summary: Parallel test runner for Robot Framework
 Home-page: https://pabot.org
 Author: Mikko Korpela