Improve parameter names

Author: forsyth2

tests/integration/test_images.py

@@ -27,77 +27,77 @@ def test_images():
         expansions = get_expansions()
         diff_dir_suffix = ""
     test_results_dict: Dict[str, Results] = dict()
-    sets_to_run: List[str] = list(expansions["sets_to_run"])
+    tasks_to_run: List[str] = list(expansions["tasks_to_run"])
     try:
         # TODO: these could be run in parallel, if easy to implement
 
         # Weekly comprehensive tests
         print("Checking weekly cfg output")
-        if "weekly_comprehensive_v2" in expansions["tests_to_run"]:
+        if "weekly_comprehensive_v2" in expansions["cfgs_to_run"]:
             set_up_and_run_image_checker(
                 "comprehensive_v2",
                 V2_CASE_NAME,
                 expansions,
                 diff_dir_suffix,
-                sets_to_run,
+                tasks_to_run,
                 test_results_dict,
             )
-        if "weekly_comprehensive_v3" in expansions["tests_to_run"]:
+        if "weekly_comprehensive_v3" in expansions["cfgs_to_run"]:
             set_up_and_run_image_checker(
                 "comprehensive_v3",
                 V3_CASE_NAME,
                 expansions,
                 diff_dir_suffix,
-                sets_to_run,
+                tasks_to_run,
                 test_results_dict,
             )
-        if "weekly_bundles" in expansions["tests_to_run"]:
+        if "weekly_bundles" in expansions["cfgs_to_run"]:
             # No mpas_analysis
-            if "mpas_analysis" in expansions["sets_to_run"]:
-                sets_to_run = sets_to_run.copy()
-                sets_to_run.remove("mpas_analysis")
+            if "mpas_analysis" in expansions["tasks_to_run"]:
+                tasks_to_run = tasks_to_run.copy()
+                tasks_to_run.remove("mpas_analysis")
             set_up_and_run_image_checker(
                 "bundles",
                 V3_CASE_NAME,
                 expansions,
                 diff_dir_suffix,
-                sets_to_run,
+                tasks_to_run,
                 test_results_dict,
             )
 
         # Legacy comprehensive tests
         # These cfgs remain unchanged, but we test the latest zppy code on them
         # to check for backwards-compatiblity issues.
         print("Checking legacy cfg output")
-        if "weekly_legacy_3.0.0_comprehensive_v2" in expansions["tests_to_run"]:
+        if "weekly_legacy_3.0.0_comprehensive_v2" in expansions["cfgs_to_run"]:
             set_up_and_run_image_checker(
                 "legacy_3.0.0_comprehensive_v2",
                 V2_CASE_NAME,
                 expansions,
                 diff_dir_suffix,
-                sets_to_run,
+                tasks_to_run,
                 test_results_dict,
             )
-        if "weekly_legacy_3.0.0_comprehensive_v3" in expansions["tests_to_run"]:
+        if "weekly_legacy_3.0.0_comprehensive_v3" in expansions["cfgs_to_run"]:
             set_up_and_run_image_checker(
                 "legacy_3.0.0_comprehensive_v3",
                 V3_CASE_NAME,
                 expansions,
                 diff_dir_suffix,
-                sets_to_run,
+                tasks_to_run,
                 test_results_dict,
             )
-        if "weekly_legacy_3.0.0_bundles" in expansions["tests_to_run"]:
+        if "weekly_legacy_3.0.0_bundles" in expansions["cfgs_to_run"]:
             # No mpas_analysis
-            if "mpas_analysis" in expansions["sets_to_run"]:
-                sets_to_run = sets_to_run.copy()
-                sets_to_run.remove("mpas_analysis")
+            if "mpas_analysis" in expansions["tasks_to_run"]:
+                tasks_to_run = tasks_to_run.copy()
+                tasks_to_run.remove("mpas_analysis")
             set_up_and_run_image_checker(
                 "legacy_3.0.0_bundles",
                 V3_CASE_NAME,
                 expansions,
                 diff_dir_suffix,
-                sets_to_run,
+                tasks_to_run,
                 test_results_dict,
             )
     except Exception as e:

tests/integration/utils.py

@@ -14,15 +14,15 @@
 TEST_SPECIFICS: Dict[str, Any] = {
     "diags_environment_commands": "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>",
     "global_time_series_environment_commands": "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>",
-    "tests_to_run": [
+    "cfgs_to_run": [
         "weekly_bundles",
         "weekly_comprehensive_v2",
         "weekly_comprehensive_v3",
         "weekly_legacy_3.0.0_bundles",
         "weekly_legacy_3.0.0_comprehensive_v2",
         "weekly_legacy_3.0.0_comprehensive_v3",
     ],
-    "sets_to_run": ["e3sm_diags", "mpas_analysis", "global_time_series", "ilamb"],
+    "tasks_to_run": ["e3sm_diags", "mpas_analysis", "global_time_series", "ilamb"],
     "unique_id": "unique_id",
 }
 
@@ -139,19 +139,19 @@ def get_expansions():
     expansions["active_mpas_analysis"] = "False"
     expansions["active_global_time_series"] = "False"
     expansions["active_ilamb"] = "False"
-    if "e3sm_diags" in TEST_SPECIFICS["sets_to_run"]:
+    if "e3sm_diags" in TEST_SPECIFICS["tasks_to_run"]:
         expansions["active_e3sm_diags"] = "True"
-    if "mpas_analysis" in TEST_SPECIFICS["sets_to_run"]:
+    if "mpas_analysis" in TEST_SPECIFICS["tasks_to_run"]:
         expansions["active_mpas_analysis"] = "True"
-    if "global_time_series" in TEST_SPECIFICS["sets_to_run"]:
+    if "global_time_series" in TEST_SPECIFICS["tasks_to_run"]:
         expansions["active_global_time_series"] = "True"
         expansions["active_mpas_analysis"] = "True"  # For ocn plots
         expansions["active_e3sm_to_cmip"] = "True"  # For lnd plots
-    if "ilamb" in TEST_SPECIFICS["sets_to_run"]:
+    if "ilamb" in TEST_SPECIFICS["tasks_to_run"]:
         expansions["active_ilamb"] = "True"
         expansions["active_e3sm_to_cmip"] = "True"
-    expansions["tests_to_run"] = TEST_SPECIFICS["tests_to_run"]
-    expansions["sets_to_run"] = TEST_SPECIFICS["sets_to_run"]
+    expansions["cfgs_to_run"] = TEST_SPECIFICS["cfgs_to_run"]
+    expansions["tasks_to_run"] = TEST_SPECIFICS["tasks_to_run"]
 
     expansions["diagnostics_base_path"] = config.get("diagnostics", "base_path")
     expansions["machine"] = machine
@@ -267,10 +267,10 @@ def generate_cfgs(unified_testing=False, dry_run=False):
         "weekly_legacy_3.0.0_comprehensive_v2",
         "weekly_legacy_3.0.0_comprehensive_v3",
     ]
-    if TEST_SPECIFICS["tests_to_run"] == []:
+    if TEST_SPECIFICS["cfgs_to_run"] == []:
         cfg_names = full_list_cfg_names
     else:
-        cfg_names = TEST_SPECIFICS["tests_to_run"]
+        cfg_names = TEST_SPECIFICS["cfgs_to_run"]
     for cfg_name in cfg_names:
         cfg_template = f"{git_top_level}/tests/integration/template_{cfg_name}.cfg"
         cfg_generated = (