Unify inputdata_root arg flags.

Author: samsrabin

relink.py

@@ -360,7 +360,10 @@ def parse_arguments():
     # ONLY INTENDED FOR USE IN TESTING
     parser.add_argument(
         "--inputdata-root",
-        "-inputdata",  # to match rimport
+        "-inputdata-root",
+        "--inputdata",
+        "-inputdata",
+        "-i",
         type=validate_directory,
         default=DEFAULT_INPUTDATA_ROOT,
         help=argparse.SUPPRESS,

rimport

@@ -70,8 +70,11 @@ def build_parser() -> argparse.ArgumentParser:
     )
 
     parser.add_argument(
+        "--inputdata-root",
+        "-inputdata-root",
         "--inputdata",
         "-inputdata",
+        "-i",
         dest="inputdata_root",
         metavar="inputdata_dir",
         default=DEFAULT_INPUTDATA_ROOT,

tests/relink/test_args.py

@@ -193,6 +193,17 @@ def test_multiple_source_roots_with_target(self, temp_dirs):
             assert str(source2.resolve()) in args.items_to_process
             assert args.target_root == str(target.resolve())
 
+    @pytest.mark.parametrize(
+        "inputdata_flag",
+        ["-inputdata", "-i", "--inputdata", "--inputdata-root", "-inputdata-root"],
+    )
+    def test_inputdata_arguments_accepted(self, temp_dirs, inputdata_flag):
+        """Test that all inputdata argument flags are accepted."""
+        inputdata_root, _ = temp_dirs
+        with patch("sys.argv", ["relink.py", inputdata_flag, inputdata_root]):
+            args = relink.parse_arguments()
+            assert args.inputdata_root == inputdata_root
+
 
 class TestValidateDirectory:
     """Test suite for validate_directory function."""

tests/rimport/test_build_parser.py

@@ -48,7 +48,7 @@ def test_list_arguments_accepted(self, list_flag):
         assert args.filelist == "files.txt"
         assert args.file is None
 
-    @pytest.mark.parametrize("inputdata_flag", ["-inputdata", "-i", "--inputdata"])
+    @pytest.mark.parametrize("inputdata_flag", ["-inputdata", "-i", "--inputdata", "--inputdata-root", "-inputdata-root"])
     def test_inputdata_arguments_accepted(self, inputdata_flag):
         """Test that all inputdata argument flags are accepted."""
         parser = rimport.build_parser()