robotframework-pabot 3.1.0__tar.gz → 4.0.0__tar.gz

{robotframework_pabot-3.1.0 → robotframework_pabot-4.0.0}/PKG-INFO

@@ -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 → robotframework_pabot-4.0.0}/README.md

@@ -55,14 +55,14 @@ There are several ways you can help in improving this tool:
 ## Command-line options
 
     pabot [--verbose|--testlevelsplit|--command .. --end-command|
-           --processes num|--pabotlib|--pabotlibhost host|--pabotlibport port|
+           --processes num|--no-pabotlib|--pabotlibhost host|--pabotlibport port|
            --processtimeout num|
            --shard i/n|
            --artifacts extensions|--artifactsinsubfolders|
            --resourcefile file|--argumentfile[num] file|--suitesfrom file] 
           [robot options] [path ...]
 
-Supports all [Robot Framework command line options](https://robotframework.org/robotframework/latest/RobotFrameworkUserGuide.html#all-command-line-options) and also following options (these must be before RF options):
+Supports all [Robot Framework command line options](https://robotframework.org/robotframework/latest/RobotFrameworkUserGuide.html#all-command-line-options) and also following pabot options:
 
 --verbose     
   more output from the parallel execution
@@ -83,8 +83,11 @@ Supports all [Robot Framework command line options](https://robotframework.org/r
   Special option "all" will use as many processes as there are
   executable suites or tests.
 
---pabotlib          
-  Start PabotLib remote server. This enables locking and resource distribution between parallel test executions.
+PabotLib remote server is started by default to enable locking and resource distribution 
+between parallel test executions.
+
+--no-pabotlib
+  Disable the PabotLib remote server if you don't need locking or resource distribution features.
 
 --pabotlibhost   [HOSTNAME]          
   Host name of the PabotLib remote server (default is 127.0.0.1)
@@ -142,8 +145,9 @@ Example usages:
      pabot --command java -jar robotframework.jar --end-command --include SMOKE tests
      pabot --processes 10 tests     
      pabot --pabotlibhost 192.168.1.123 --pabotlibport 8271 --processes 10 tests
-     pabot --pabotlib --pabotlibhost 192.168.1.111 --pabotlibport 8272 --processes 10 tests
      pabot --artifacts png,mp4,txt --artifactsinsubfolders directory_to_tests
+     # To disable PabotLib:
+     pabot --no-pabotlib tests
 
 ### PabotLib
 

{robotframework_pabot-3.1.0 → robotframework_pabot-4.0.0}/src/pabot/__init__.py

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

{robotframework_pabot-3.1.0 → robotframework_pabot-4.0.0}/src/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]

{robotframework_pabot-3.1.0 → robotframework_pabot-4.0.0}/src/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 → robotframework_pabot-4.0.0}/src/robotframework_pabot.egg-info/PKG-INFO

@@ -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 → robotframework_pabot-4.0.0}/tests/test_depends.py

@@ -96,7 +96,7 @@ class DependsTest(unittest.TestCase):
         --test Test.The Test S1Test 08
         """,
         )
-        self.assertIn(b"circular or unmet dependencies", stderr)
+        self.assertIn(b"Invalid test configuration: Circular or unmet dependencies detected between test suites", stdout)
 
     def test_unmet_dependency(self):
         stdout, stderr = self._run_tests_with(
@@ -107,7 +107,7 @@ class DependsTest(unittest.TestCase):
         --test Test.The Test S1Test 08
         """,
         )
-        self.assertIn(b"circular or unmet dependencies", stderr)
+        self.assertIn(b"Invalid test configuration: Circular or unmet dependencies detected between test suites. Please check your #DEPENDS definitions.", stdout)
 
     def test_same_reference(self):
         stdout, stderr = self._run_tests_with(
@@ -118,7 +118,7 @@ class DependsTest(unittest.TestCase):
         --test Test.The Test S1Test 08
         """,
         )
-        self.assertIn(b"circular or unmet dependencies", stderr)
+        self.assertIn(b"Invalid test configuration: Circular or unmet dependencies detected between test suites. Please check your #DEPENDS definitions.", stdout)
 
     def test_wait(self):
         stdout, stderr = self._run_tests_with(
@@ -130,4 +130,4 @@ class DependsTest(unittest.TestCase):
         --test Test.The Test S1Test 08
         """,
         )
-        self.assertIn(b"circular or unmet dependencies", stderr)
+        self.assertIn(b"Invalid test configuration: Circular or unmet dependencies detected between test suites", stdout)

{robotframework_pabot-3.1.0 → robotframework_pabot-4.0.0}/tests/test_pabot.py

@@ -1329,7 +1329,68 @@ class PabotTests(unittest.TestCase):
                 self.assertNotIn('schemaversion="4"', content)
         finally:
             shutil.rmtree(dtemp) 
+    
+    def test_parse_args_mixed_order(self):
+        options, datasources, pabot_args, options_for_subprocesses = arguments.parse_args([
+            "--exitonfailure",
+            "--processes", "12", 
+            "--outputdir", "mydir",
+            "--verbose",
+            "--pabotlib",
+            "suite"
+        ])
+        self.assertEqual(pabot_args["processes"], 12)
+        self.assertEqual(pabot_args["verbose"], True)
+        self.assertEqual(pabot_args["pabotlib"], True)
+        self.assertEqual(options["outputdir"], "mydir")
+        self.assertEqual(options["exitonfailure"], True)
+        self.assertEqual(datasources, ["suite"])
 
+    def test_parse_args_error_handling(self):
+        with self.assertRaises(DataError) as cm:
+            arguments.parse_args(["--processes"])
+        self.assertIn("requires a value", str(cm.exception))
+
+        with self.assertRaises(DataError) as cm:
+            arguments.parse_args(["--processes", "invalid"])
+        self.assertIn("Invalid value for --processes", str(cm.exception))
+
+        with self.assertRaises(DataError) as cm:
+            arguments.parse_args(["--command", "echo", "hello"])
+        self.assertIn("requires matching --end-command", str(cm.exception))
+
+    def test_parse_args_command_with_pabot_args(self):
+        options, datasources, pabot_args, _ = arguments.parse_args([
+            "--command",
+            "script.sh",
+            "--processes",
+            "5",
+            "--end-command",
+            "--verbose",
+            "suite"
+        ])
+        self.assertEqual(pabot_args["command"], ["script.sh", "--processes", "5"])
+        self.assertEqual(pabot_args["verbose"], True)
+
+    def test_pabotlib_defaults_to_enabled(self):
+        options, _, pabot_args, _ = arguments.parse_args(["suite"])
+        self.assertTrue(pabot_args["pabotlib"])
+        self.assertFalse("no_pabotlib" in pabot_args)  # Ensure internal flag not leaked
+
+    def test_no_pabotlib_disables_pabotlib(self):
+        options, _, pabot_args, _ = arguments.parse_args(["--no-pabotlib", "suite"])
+        self.assertFalse(pabot_args["pabotlib"])
+        self.assertFalse("no_pabotlib" in pabot_args)  # Ensure internal flag not leaked
+
+    def test_pabotlib_option_shows_warning(self):
+        options, _, pabot_args, _ = arguments.parse_args(["--pabotlib", "suite"])
+        self.assertTrue(pabot_args["pabotlib"])
+        self.assertFalse("no_pabotlib" in pabot_args)  # Ensure internal flag not leaked
+
+    def test_conflicting_pabotlib_options_raise_error(self):
+        with self.assertRaises(DataError) as context:
+            arguments.parse_args(["--pabotlib", "--no-pabotlib", "suite"])
+        self.assertIn("Cannot use both --pabotlib and --no-pabotlib", str(context.exception))
 
 if __name__ == "__main__":
     unittest.main()