Fix inconsistent error messages involving output-file (#191)

fox-it · Sep 9, 2024 · de0ab7e · de0ab7e
1 parent 16f8afa
commit de0ab7e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/acquire/utils.py b/acquire/utils.py
@@ -312,9 +312,9 @@ def check_and_set_acquire_args(
     if not args.upload:
         # check output related configuration
         if (args.children or len(args.targets) > 1) and args.output_file:
-            raise ValueError("--children can not be used with --output_file. Use --output instead")
+            raise ValueError("--children can not be used with --output-file. Use --output instead")
         elif args.output_file and (not args.output_file.parent.is_dir() or args.output_file.is_dir()):
-            raise ValueError("--output_file must be a path to a file in an existing directory")
+            raise ValueError("--output-file must be a path to a file in an existing directory")
         elif args.output and not args.output.is_dir():
             raise ValueError(f"Output directory doesn't exist or is a file: {args.output}")
 

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -229,21 +229,21 @@ def test_check_and_set_acquire_args_output(children: bool, arg_name: str, output
             True,
             "output_file",
             get_mock_path(is_dir=False),
-            "--children can not be used with --output_file. Use --output instead",
+            "--children can not be used with --output-file. Use --output instead",
         ),
         # Output_file is a directory
         (
             False,
             "output_file",
             get_mock_path(),
-            "--output_file must be a path to a file in an existing directory",
+            "--output-file must be a path to a file in an existing directory",
         ),
         # Output_file has a non-existing parent directory
         (
             False,
             "output_file",
             get_mock_path(is_dir=False, parent_is_dir=False),
-            "--output_file must be a path to a file in an existing directory",
+            "--output-file must be a path to a file in an existing directory",
         ),
         # Output is a non-existing directory
         (