Fix tests after changing order of variable definition

Author: douglasjacobsen

lib/ramble/ramble/test/application.py

@@ -382,15 +382,15 @@ def test_set_input_path_multi_input(mutable_mock_apps_repo):
     assert executable_application_instance.variables["test-input3"] == input3_path
 
 
-def test_set_default_experiment_variables(mutable_mock_apps_repo):
-    """_set_default_experiment_variables"""
+def test_set_variables(mutable_mock_apps_repo):
+    """Test that set_variables defines workload variables"""
 
     executable_application_instance = mutable_mock_apps_repo.get("basic")
 
     expansion_vars = basic_exp_dict()
+    del expansion_vars["n_ranks"]
 
     # Set up the instance to pass the initial part of the function
-    executable_application_instance.expander = ramble.expander.Expander(expansion_vars, None)
 
     test_wl = ramble.workload.Workload("test_wl", executables=["foo"], inputs=["input"])
     test_wl2 = ramble.workload.Workload("test_wl2", executables=["bar"], inputs=["input"])
@@ -400,9 +400,8 @@ def test_set_default_experiment_variables(mutable_mock_apps_repo):
     executable_application_instance.internals = {}
 
     executable_application_instance.inputs[_FS] = {"input": {"target_dir": "."}}
-    executable_application_instance.variables = {}
 
-    executable_application_instance._set_default_experiment_variables()
+    executable_application_instance.set_variables(expansion_vars, None)
 
     assert executable_application_instance.variables["n_ranks"] == "1"
 
@@ -414,9 +413,6 @@ def test_define_commands(mutable_mock_apps_repo):
 
     expansion_vars = basic_exp_dict()
 
-    # Set up the instance to pass the initial part of the function
-    executable_application_instance.expander = ramble.expander.Expander(expansion_vars, None)
-
     test_wl = ramble.workload.Workload("test_wl", executables=["foo"], inputs=["input"])
     test_wl2 = ramble.workload.Workload("test_wl2", executables=["bar"], inputs=["input"])
     test_wl2.add_variable(ramble.workload.WorkloadVariable("n_ranks", default="1"))
@@ -425,14 +421,13 @@ def test_define_commands(mutable_mock_apps_repo):
     executable_application_instance.internals = {}
 
     executable_application_instance.inputs[_FS] = {"input": {"target_dir": "."}}
-    executable_application_instance.variables = {}
+    executable_application_instance.set_variables(expansion_vars, None)
 
     exec_graph = executable_application_instance._get_executable_graph("test_wl2")
 
     executable_application_instance.set_formatted_executables(
         {"command": {"join_separator": "\n"}}
     )
-    executable_application_instance._set_default_experiment_variables()
 
     executable_application_instance.chain_prepend = []
     executable_application_instance._define_commands(exec_graph)
@@ -484,9 +479,6 @@ def test_derive_variables_for_template_path(mutable_mock_apps_repo, workspace_na
 
     expansion_vars = basic_exp_dict()
 
-    # Set up the instance to pass the initial part of the function
-    executable_application_instance.expander = ramble.expander.Expander(expansion_vars, None)
-
     test_wl = ramble.workload.Workload("test_wl", executables=["foo"], inputs=["input"])
     test_wl2 = ramble.workload.Workload("test_wl2", executables=["bar"], inputs=["input"])
     test_wl2.add_variable(ramble.workload.WorkloadVariable("n_ranks", default="1"))
@@ -495,12 +487,10 @@ def test_derive_variables_for_template_path(mutable_mock_apps_repo, workspace_na
     executable_application_instance.internals = {}
 
     executable_application_instance.inputs[_FS] = {"input": {"target_dir": "."}}
-    executable_application_instance.variables = {}
+    executable_application_instance.set_variables(expansion_vars, None)
 
     exec_graph = executable_application_instance._get_executable_graph("test_wl2")
 
-    executable_application_instance._set_default_experiment_variables()
-
     executable_application_instance.chain_prepend = []
     executable_application_instance._define_commands(exec_graph)
     executable_application_instance._define_formatted_executables()

var/ramble/repos/builtin/package_managers/spack-lightweight/test/spack_runner.py

@@ -327,6 +327,8 @@ def test_new_compiler_installs(tmpdir, capsys, request):
     import os
 
     with tmpdir.as_cwd():
+        # compilers.yaml is written to support older spack versions.
+        # The compiler information was changed to exist in the packages.yaml file around v1.0.0
         compilers_config = """
 compilers::
 - compiler:
@@ -352,6 +354,11 @@ def test_new_compiler_installs(tmpdir, capsys, request):
     externals:
     - spec: [email protected] languages=c,fortran
       prefix: {os.getcwd()}
+      extra_attributes:
+        compilers:
+          c: /tmpdir_path/gcc
+          cxx: /tmpdir_path/g++
+          fortran: /tmpdir_path/gfortran
     buildable: false
 """