Make pbs_config as default argument in render_job_script

benchcab/utils/pbs.py

@@ -3,27 +3,23 @@
 
 """Contains helper functions for manipulating PBS job scripts."""
 
-from typing import Optional
-
 from benchcab import internal
 
-
 def render_job_script(
     project: str,
     config_path: str,
     modules: list,
     benchcab_path: str,
+    pbs_config: dict,
     verbose=False,
     skip_bitwise_cmp=False,
-    pbs_config: Optional[dict] = None,
 ) -> str:
     """Returns the text for a PBS job script that executes all computationally expensive commands.
 
     This includes things such as running CABLE and running bitwise comparison jobs
     between model output files.
     """
-    if pbs_config is None:
-        pbs_config = internal.FLUXSITE_DEFAULT_PBS
+    pbs_config = internal.FLUXSITE_DEFAULT_PBS | pbs_config
 
     module_load_lines = "\n".join(
         f"module load {module_name}" for module_name in modules

tests/test_pbs.py

@@ -13,6 +13,7 @@ def test_default_job_script(self):
             project="tm70",
             config_path="/path/to/config.yaml",
             modules=["foo", "bar", "baz"],
+            pbs_config=internal.FLUXSITE_DEFAULT_PBS,
             benchcab_path="/absolute/path/to/benchcab",
         ) == (
             f"""#!/bin/bash
@@ -46,6 +47,7 @@ def test_verbose_flag_added_to_command_line_arguments(self):
             project="tm70",
             config_path="/path/to/config.yaml",
             modules=["foo", "bar", "baz"],
+            pbs_config=internal.FLUXSITE_DEFAULT_PBS,
             verbose=True,
             benchcab_path="/absolute/path/to/benchcab",
         ) == (
@@ -80,6 +82,7 @@ def test_skip_bitwise_comparison_step(self):
             project="tm70",
             config_path="/path/to/config.yaml",
             modules=["foo", "bar", "baz"],
+            pbs_config=internal.FLUXSITE_DEFAULT_PBS,
             skip_bitwise_cmp=True,
             benchcab_path="/absolute/path/to/benchcab",
         ) == (
@@ -145,7 +148,7 @@ def test_pbs_config_parameters(self):
         )
 
     def test_default_pbs_config(self):
-        """Success case: if the pbs_config is empty, use the default values."""
+        """Success case: if any key(s) of pbs_config is/are empty, use the default values."""
         assert render_job_script(
             project="tm70",
             config_path="/path/to/config.yaml",