robotframework-pabot 3.1.0__py3-none-any.whl → 4.0.0__py3-none-any.whl

pabot/__init__.py

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

pabot/arguments.py

@@ -80,7 +80,7 @@ def _parse_pabot_args(args):  # type: (List[str]) -> Tuple[List[str], Dict[str,
         "verbose": False,
         "help": False,
         "testlevelsplit": False,
-        "pabotlib": False,
+        "pabotlib": True,
         "pabotlibhost": "127.0.0.1",
         "pabotlibport": 8270,
         "processes": _processes_count(),
@@ -91,108 +91,100 @@ def _parse_pabot_args(args):  # type: (List[str]) -> Tuple[List[str], Dict[str,
         "shardcount": 1,
         "chunk": False,
     }
+    # Explicitly define argument types for validation
+    flag_args = {
+        "verbose", "help", "testlevelsplit", "pabotlib", 
+        "artifactsinsubfolders", "chunk"
+    }
+    value_args = {
+        "hive": str,
+        "processes": lambda x: int(x) if x != 'all' else None,
+        "resourcefile": str,
+        "pabotlibhost": str,
+        "pabotlibport": int,
+        "processtimeout": int,
+        "ordering": _parse_ordering,
+        "suitesfrom": str,
+        "artifacts": lambda x: x.split(","),
+        "shard": _parse_shard
+    }
+
     argumentfiles = []
-    while args and (
-        args[0]
-        in [
-            "--" + param
-            for param in [
-                "hive",
-                "command",
-                "processes",
-                "verbose",
-                "resourcefile",
-                "testlevelsplit",
-                "pabotlib",
-                "pabotlibhost",
-                "pabotlibport",
-                "processtimeout",
-                "ordering",
-                "suitesfrom",
-                "artifacts",
-                "artifactsinsubfolders",
-                "help",
-                "shard",
-                "chunk",
-            ]
-        ]
-        or ARGSMATCHER.match(args[0])
-    ):
-        if args[0] == "--hive":
-            pabot_args["hive"] = args[1]
-            args = args[2:]
-            continue
-        if args[0] == "--command":
-            end_index = args.index("--end-command")
-            pabot_args["command"] = args[1:end_index]
-            args = args[end_index + 1 :]
-            continue
-        if args[0] == "--processes":
-            pabot_args["processes"] = int(args[1]) if args[1] != 'all' else None
-            args = args[2:]
-            continue
-        if args[0] == "--verbose":
-            pabot_args["verbose"] = True
-            args = args[1:]
-            continue
-        if args[0] == "--chunk":
-            pabot_args["chunk"] = True
-            args = args[1:]
-            continue
-        if args[0] == "--resourcefile":
-            pabot_args["resourcefile"] = args[1]
-            args = args[2:]
-            continue
-        if args[0] == "--pabotlib":
-            pabot_args["pabotlib"] = True
-            args = args[1:]
-            continue
-        if args[0] == "--ordering":
-            pabot_args["ordering"] = _parse_ordering(args[1])
-            args = args[2:]
+    remaining_args = []
+    i = 0
+
+    # Track conflicting options during parsing
+    saw_pabotlib_flag = False
+    saw_no_pabotlib = False
+
+    while i < len(args):
+        arg = args[i]
+        if not arg.startswith('--'):
+            remaining_args.append(arg)
+            i += 1
             continue
-        if args[0] == "--testlevelsplit":
-            pabot_args["testlevelsplit"] = True
+            
+        arg_name = arg[2:]  # Strip '--'
+
+        if arg_name == "no-pabotlib":
+            saw_no_pabotlib = True
+            pabot_args["pabotlib"] = False  # Just set the main flag
             args = args[1:]
             continue
-        if args[0] == "--pabotlibhost":
-            pabot_args["pabotlibhost"] = args[1]
-            args = args[2:]
-            continue
-        if args[0] == "--pabotlibport":
-            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:]
-            continue
-        if args[0] == "--artifacts":
-            pabot_args["artifacts"] = args[1].split(",")
-            args = args[2:]
-            continue
-        if args[0] == "--artifactsinsubfolders":
-            pabot_args["artifactsinsubfolders"] = True
+        if arg_name == "pabotlib":
+            saw_pabotlib_flag = True
             args = args[1:]
             continue
-        if args[0] == "--shard":
-            pabot_args["shardindex"], pabot_args["shardcount"] = _parse_shard(args[1])
-            args = args[2:]
-            continue
-        match = ARGSMATCHER.match(args[0])
+        
+        # Special case for command
+        if arg_name == "command":
+            try:
+                end_index = args.index("--end-command", i)
+                pabot_args["command"] = args[i+1:end_index]
+                i = end_index + 1
+                continue
+            except ValueError:
+                raise DataError("--command requires matching --end-command")
+                
+        # Handle flag arguments
+        if arg_name in flag_args:
+            pabot_args[arg_name] = True
+            i += 1
+            continue
+            
+        # Handle value arguments
+        if arg_name in value_args:
+            if i + 1 >= len(args):
+                raise DataError(f"--{arg_name} requires a value")
+            try:
+                value = value_args[arg_name](args[i + 1])
+                if arg_name == "shard":
+                    pabot_args["shardindex"], pabot_args["shardcount"] = value
+                else:
+                    pabot_args[arg_name] = value
+                i += 2
+                continue
+            except (ValueError, TypeError) as e:
+                raise DataError(f"Invalid value for --{arg_name}: {args[i + 1]}")
+                
+        # Handle argument files
+        match = ARGSMATCHER.match(arg)
         if match:
-            argumentfiles += [(match.group(1), args[1])]
-            args = args[2:]
-            continue
-        if args and args[0] == "--help":
-            pabot_args["help"] = True
-            args = args[1:]
+            if i + 1 >= len(args):
+                raise DataError(f"{arg} requires a value")
+            argumentfiles.append((match.group(1), args[i + 1]))
+            i += 2
+            continue
+            
+        # If we get here, it's a non-pabot argument
+        remaining_args.append(arg)
+        i += 1
+    
+    if saw_pabotlib_flag and saw_no_pabotlib:
+        raise DataError("Cannot use both --pabotlib and --no-pabotlib options together")
+    
     pabot_args["argumentfiles"] = argumentfiles
-    return args, pabot_args
+    return remaining_args, pabot_args
 
 
 def _parse_ordering(filename):  # type: (str) -> List[ExecutionItem]

pabot/pabot.py

@@ -2019,17 +2019,17 @@ def _verify_depends(suite_names):
         )
     )
     if suites_with_depends != suites_with_found_dependencies:
-        raise Exception("There are unmet dependencies using #DEPENDS")
+        raise DataError("Invalid test configuration: Some test suites have dependencies (#DEPENDS) that cannot be found.")
     suites_with_circular_dependencies = list(
         filter(lambda suite: suite.depends == suite.name, suites_with_depends)
     )
     if suites_with_circular_dependencies:
-        raise Exception("There are suites with circular dependencies using #DEPENDS")
+        raise DataError("Invalid test configuration: Test suites cannot depend on themselves.")
     grouped_suites = list(
         filter(lambda suite: isinstance(suite, GroupItem), suite_names)
     )
     if grouped_suites and suites_with_depends:
-        raise Exception("#DEPENDS and grouped suites are incompatible")
+        raise DataError("Invalid test configuration: Cannot use both #DEPENDS and grouped suites.")
 
 
 def _group_by_depend(suite_names):
@@ -2057,7 +2057,7 @@ def _group_by_depend(suite_names):
         dependency_tree += [dependent_on_last_stage]
     flattened_dependency_tree = sum(dependency_tree, [])
     if len(flattened_dependency_tree) != len(runnable_suites):
-        raise Exception("There are circular or unmet dependencies using #DEPENDS")
+        raise DataError("Invalid test configuration: Circular or unmet dependencies detected between test suites. Please check your #DEPENDS definitions.")
     return dependency_tree
 
 

{robotframework_pabot-3.1.0.dist-info → robotframework_pabot-4.0.0.dist-info}/METADATA

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

{robotframework_pabot-3.1.0.dist-info → robotframework_pabot-4.0.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 pabot/SharedLibrary.py,sha256=lVYRIajUlMzlNT7bSylLYL248Rumh4dlg4OMl3M988E,2479
-pabot/__init__.py,sha256=_HHnPnSAmYJ5aUmJ4KE2UnHPIlR7HCvMgiN8SrX8afU,93
-pabot/arguments.py,sha256=K9OXolHBrVjE_qhg2KRmC5u8zsUjKO7aICax-SWSmH0,7350
+pabot/__init__.py,sha256=rcrYtEQEaO-Ne2-f9csXGogs2eiVd4yRdxkBGmnItxw,93
+pabot/arguments.py,sha256=hgENptU63ftYktbQTNahDYC-50kJQYTRUM-yZ-6wln8,7046
 pabot/clientwrapper.py,sha256=yz7battGs0exysnDeLDWJuzpb2Q-qSjitwxZMO2TlJw,231
 pabot/coordinatorwrapper.py,sha256=nQQ7IowD6c246y8y9nsx0HZbt8vS2XODhPVDjm-lyi0,195
 pabot/execution_items.py,sha256=e7mjwAdgd-qGHjk9fR5QmIxqf6_c73rVbMGHVfU924I,8327
-pabot/pabot.py,sha256=eYL3LLpy2GXeKiqnRvaal9yvZYqXVEK9jV-zZQi1o2E,67663
+pabot/pabot.py,sha256=XqWTq7SlXbcWjV_m3bk3Yq3D-xqTVZTGwkllIWKIjgg,67826
 pabot/pabotlib.py,sha256=XgiEtDJ8ZkoOcBAWokgzY5TlfYIL4hZN9Q3-Kj-5HhQ,22312
 pabot/result_merger.py,sha256=0LJN5AhgbaXW0OSCvygYvhxY3eOwYp5GntTjLASqsu8,8864
 pabot/robotremoteserver.py,sha256=L3O2QRKSGSE4ux5M1ip5XJMaelqaxQWJxd9wLLdtpzM,22272
@@ -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=7earx6jFDSaK7LofHHv1fWuPEw7uxYN48JT6NZMWEdk,2558
 pabot/py3/worker.py,sha256=5rfp4ZiW6gf8GRz6eC0-KUkfx847A91lVtRYpLAv2sg,1612
-robotframework_pabot-3.1.0.dist-info/LICENSE.txt,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-robotframework_pabot-3.1.0.dist-info/METADATA,sha256=qClRqQ5x5M1IZtAZoFVlOC_jGBTdonBKUDZUJY5dwgE,997
-robotframework_pabot-3.1.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-robotframework_pabot-3.1.0.dist-info/entry_points.txt,sha256=JpAIFADTeFOQWdwmn56KpAil8V3-41ZC5ICXCYm3Ng0,43
-robotframework_pabot-3.1.0.dist-info/top_level.txt,sha256=t3OwfEAsSxyxrhjy_GCJYHKbV_X6AIsgeLhYeHvObG4,6
-robotframework_pabot-3.1.0.dist-info/RECORD,,
+robotframework_pabot-4.0.0.dist-info/LICENSE.txt,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+robotframework_pabot-4.0.0.dist-info/METADATA,sha256=gmCpH_OKFwnSgV9hZU8TO_8CfUfJ92g7kWmlAEJfkxE,997
+robotframework_pabot-4.0.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+robotframework_pabot-4.0.0.dist-info/entry_points.txt,sha256=JpAIFADTeFOQWdwmn56KpAil8V3-41ZC5ICXCYm3Ng0,43
+robotframework_pabot-4.0.0.dist-info/top_level.txt,sha256=t3OwfEAsSxyxrhjy_GCJYHKbV_X6AIsgeLhYeHvObG4,6
+robotframework_pabot-4.0.0.dist-info/RECORD,,