Skip to content

Commit 84d6d60

Browse files
committed
relink: Move inputdata_root args to shared function and use that.
1 parent b1ffb2a commit 84d6d60

3 files changed

Lines changed: 27 additions & 13 deletions

File tree

relink.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
DEFAULT_STAGING_ROOT,
1818
get_log_level,
1919
add_parser_verbosity_group,
20+
add_inputdata_root,
2021
validate_paths,
2122
validate_directory,
2223
)
@@ -316,18 +317,8 @@ def parse_arguments():
316317
),
317318
)
318319

319-
# The root of the directory tree containing CESM input data.
320-
# ONLY INTENDED FOR USE IN TESTING
321-
parser.add_argument(
322-
"--inputdata-root",
323-
"-inputdata-root",
324-
"--inputdata",
325-
"-inputdata",
326-
"-i",
327-
type=validate_directory,
328-
default=DEFAULT_INPUTDATA_ROOT,
329-
help=argparse.SUPPRESS,
330-
)
320+
# Add inputdata_root option flags
321+
add_inputdata_root(parser)
331322

332323
# Add verbosity options
333324
add_parser_verbosity_group(parser)

shared.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,27 @@ def get_log_level(quiet: bool = False, verbose: bool = False) -> int:
3232
return logging.INFO
3333

3434

35+
def add_inputdata_root(parser: argparse.ArgumentParser):
36+
"""Add inputdata_root option to an argument parser.
37+
38+
The root of the directory tree containing CESM input data. Only intended for use in testing, so
39+
help is suppressed.
40+
41+
Args:
42+
parser: ArgumentParser instance to add the inputdata_root arg to.
43+
"""
44+
parser.add_argument(
45+
"--inputdata-root",
46+
"-inputdata-root",
47+
"--inputdata",
48+
"-inputdata",
49+
"-i",
50+
type=validate_directory,
51+
default=DEFAULT_INPUTDATA_ROOT,
52+
help=argparse.SUPPRESS,
53+
)
54+
55+
3556
def add_parser_verbosity_group(parser: argparse.ArgumentParser):
3657
"""Add mutually exclusive verbosity options to an argument parser.
3758

tests/relink/conftest.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ def fixture_temp_dirs():
1818

1919
with patch("relink.DEFAULT_INPUTDATA_ROOT", source_dir):
2020
with patch("relink.DEFAULT_STAGING_ROOT", target_dir):
21-
yield source_dir, target_dir
21+
with patch("shared.DEFAULT_INPUTDATA_ROOT", source_dir):
22+
with patch("shared.DEFAULT_STAGING_ROOT", target_dir):
23+
yield source_dir, target_dir
2224

2325
# Cleanup
2426
shutil.rmtree(source_dir, ignore_errors=True)

0 commit comments

Comments
 (0)