rimport: Use shared add_inputdata_root().

Changes behavior to hide inputdata_root help text.

Author: samsrabin

rimport

@@ -69,20 +69,8 @@ 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,
-        help=(
-            "Change the default local top level inputdata directory."
-            f" Default: '{DEFAULT_INPUTDATA_ROOT}'"
-        ),
-    )
+    # Add inputdata_root option flags
+    shared.add_inputdata_root(parser)
 
     parser.add_argument(
         "--check",

tests/conftest.py

@@ -1,13 +1,33 @@
 """
-Pytest configuration and shared fixtures for relink tests.
+Pytest configuration and shared fixtures for all tests.
 """
 
 import os
+import tempfile
+import shutil
 
 import pytest
+from unittest.mock import patch
 
 
 @pytest.fixture(scope="session")
 def workspace_root():
     """Return the root directory of the workspace."""
     return os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+@pytest.fixture(scope="function", name="temp_dirs")
+def fixture_temp_dirs():
+    """Create temporary source and target directories for testing."""
+    source_dir = tempfile.mkdtemp(prefix="test_source_")
+    target_dir = tempfile.mkdtemp(prefix="test_target_")
+
+    with patch("relink.DEFAULT_INPUTDATA_ROOT", source_dir):
+        with patch("relink.DEFAULT_STAGING_ROOT", target_dir):
+            with patch("shared.DEFAULT_INPUTDATA_ROOT", source_dir):
+                with patch("shared.DEFAULT_STAGING_ROOT", target_dir):
+                    yield source_dir, target_dir
+
+    # Cleanup
+    shutil.rmtree(source_dir, ignore_errors=True)
+    shutil.rmtree(target_dir, ignore_errors=True)

tests/relink/conftest.py

@@ -3,28 +3,8 @@
 """
 
 import os
-import tempfile
-import shutil
 
 import pytest
-from unittest.mock import patch
-
-
-@pytest.fixture(scope="function", name="temp_dirs")
-def fixture_temp_dirs():
-    """Create temporary source and target directories for testing."""
-    source_dir = tempfile.mkdtemp(prefix="test_source_")
-    target_dir = tempfile.mkdtemp(prefix="test_target_")
-
-    with patch("relink.DEFAULT_INPUTDATA_ROOT", source_dir):
-        with patch("relink.DEFAULT_STAGING_ROOT", target_dir):
-            with patch("shared.DEFAULT_INPUTDATA_ROOT", source_dir):
-                with patch("shared.DEFAULT_STAGING_ROOT", target_dir):
-                    yield source_dir, target_dir
-
-    # Cleanup
-    shutil.rmtree(source_dir, ignore_errors=True)
-    shutil.rmtree(target_dir, ignore_errors=True)
 
 
 @pytest.fixture(name="current_user")

tests/rimport/test_build_parser.py

@@ -5,6 +5,7 @@
 import os
 import sys
 import argparse
+from pathlib import Path
 import importlib.util
 from importlib.machinery import SourceFileLoader
 
@@ -49,12 +50,12 @@ def test_list_arguments_accepted(self, list_flag):
         assert args.file is None
 
     @pytest.mark.parametrize("inputdata_flag", ["-inputdata", "-i", "--inputdata", "--inputdata-root", "-inputdata-root"])
-    def test_inputdata_arguments_accepted(self, inputdata_flag):
+    def test_inputdata_arguments_accepted(self, temp_dirs, inputdata_flag):
         """Test that all inputdata argument flags are accepted."""
+        inputdata_root, _ = temp_dirs
         parser = rimport.build_parser()
-        inputdata_dir = "/some/dir"
-        args = parser.parse_args([inputdata_flag, inputdata_dir, "-f", "dummy_file.nc"])
-        assert args.inputdata_root == inputdata_dir
+        args = parser.parse_args([inputdata_flag, inputdata_root, "-f", "dummy_file.nc"])
+        assert args.inputdata_root == inputdata_root
 
     def test_file_and_list_mutually_exclusive(self, capsys):
         """Test that -file and -list cannot be used together."""
@@ -82,7 +83,7 @@ def test_inputdata_default(self):
         """Test that -inputdata has correct default value."""
         parser = rimport.build_parser()
         args = parser.parse_args(["-file", "test.txt"])
-        assert args.inputdata_root == rimport.DEFAULT_INPUTDATA_ROOT
+        assert args.inputdata_root == str(rimport.DEFAULT_INPUTDATA_ROOT)
 
     def test_check_default(self):
         """Test that --check has the correct default value."""
@@ -97,10 +98,12 @@ def test_check_arguments_accepted(self, check_flag):
         args = parser.parse_args(["-file", "test.txt", check_flag])
         assert args.check is True
 
-    def test_inputdata_custom(self):
+    def test_inputdata_custom(self, temp_dirs):
         """Test that -inputdata can be customized."""
         parser = rimport.build_parser()
-        custom_path = "/custom/path"
+        inputdata_root, _ = temp_dirs
+        custom_path = os.path.join(inputdata_root, "custom", "path")
+        os.makedirs(custom_path)
         args = parser.parse_args(["-file", "test.txt", "-inputdata", custom_path])
         assert args.inputdata_root == custom_path
 
@@ -113,19 +116,25 @@ def test_help_flags_show_help(self, help_flag):
         # Help should exit with code 0
         assert exc_info.value.code == 0
 
-    def test_file_with_inputdata(self):
+    def test_file_with_inputdata(self, temp_dirs):
         """Test combining -file with -inputdata."""
         parser = rimport.build_parser()
-        args = parser.parse_args(["-file", "data.nc", "-inputdata", "/my/data"])
+        inputdata_root, _ = temp_dirs
+        custom_path = os.path.join(inputdata_root, "custom", "path2")
+        os.makedirs(custom_path)
+        args = parser.parse_args(["-file", "data.nc", "-inputdata", custom_path])
         assert args.file == "data.nc"
-        assert args.inputdata_root == "/my/data"
+        assert args.inputdata_root == custom_path
 
-    def test_list_with_inputdata(self):
+    def test_list_with_inputdata(self, temp_dirs):
         """Test combining -list with -inputdata."""
         parser = rimport.build_parser()
-        args = parser.parse_args(["-list", "files.txt", "-inputdata", "/my/data"])
+        inputdata_root, _ = temp_dirs
+        custom_path = os.path.join(inputdata_root, "custom", "path3")
+        os.makedirs(custom_path)
+        args = parser.parse_args(["-list", "files.txt", "-inputdata", custom_path])
         assert args.filelist == "files.txt"
-        assert args.inputdata_root == "/my/data"
+        assert args.inputdata_root == custom_path
 
     def test_quiet_default(self):
         """Test that quiet defaults to False."""

tests/rimport/test_main.py

@@ -9,6 +9,7 @@
 import importlib.util
 from importlib.machinery import SourceFileLoader
 from unittest.mock import patch, call
+import pytest
 
 # pylint: disable=too-many-arguments,too-many-positional-arguments
 
@@ -156,14 +157,15 @@ def stage_data_side_effect(src, *_args, **_kwargs):
     def test_nonexistent_inputdata_directory(
         self, _mock_ensure_running_as, tmp_path, capsys
     ):
-        """Test that main() returns error code 2 for nonexistent inputdata directory."""
+        """Test that argument parser rejects nonexistent inputdata directory."""
         nonexistent = tmp_path / "nonexistent"
 
-        result = rimport.main(["-file", "test.nc", "-inputdata", str(nonexistent)])
+        with pytest.raises(SystemExit) as exc_info:
+            rimport.main(["-file", "test.nc", "-inputdata", str(nonexistent)])
 
-        assert result == 2
+        assert exc_info.value.code == 2
         captured = capsys.readouterr()
-        assert "inputdata directory does not exist" in captured.err
+        assert "does not exist" in captured.err
 
     @patch.object(rimport, "ensure_running_as")
     def test_nonexistent_filelist(self, _mock_ensure_running_as, tmp_path, capsys):