Fix tests that refer to software direcories

lib/ramble/ramble/test/end_to_end/dryrun_copies_external_env.py

@@ -79,7 +79,7 @@ def test_dryrun_copies_external_env(mutable_config, mutable_mock_workspace_path,
         setup_pipeline = setup_cls(ws, filters)
         setup_pipeline.run()
 
-        env_file = os.path.join(ws.software_dir, "wrfv4", "spack.yaml")
+        env_file = os.path.join(ws.software_dir, "spack", "wrfv4", "spack.yaml")
 
         assert os.path.exists(env_file)
 

lib/ramble/ramble/test/end_to_end/experiment_excludes.py

@@ -162,7 +162,7 @@ def test_wrfv4_exclusions(mutable_config, mutable_mock_workspace_path):
         software_base_dir = os.path.join(ws1.root, ramble.workspace.workspace_software_path)
         assert os.path.exists(software_base_dir)
         for software_dir in software_dirs:
-            software_path = os.path.join(software_base_dir, software_dir)
+            software_path = os.path.join(software_base_dir, "spack", software_dir)
             assert os.path.exists(software_path)
 
             spack_file = os.path.join(software_path, "spack.yaml")

lib/ramble/ramble/test/end_to_end/experiment_hashes.py

@@ -85,7 +85,7 @@ def test_experiment_hashes(mutable_config, mutable_mock_workspace_path, request)
     assert len(expected_templates) == 0
 
     # Test software environments
-    expected_envs = {"software/gromacs"}
+    expected_envs = {"software/spack/gromacs"}
     assert "software" in data
     for env in data["software"]:
         if env["name"] in expected_envs:

lib/ramble/ramble/test/end_to_end/experiment_repeats.py

@@ -115,10 +115,10 @@ def test_gromacs_repeats(mutable_config, mutable_mock_workspace_path):
 
         # Test software directories
         software_dirs = ["gromacs"]
-        software_base_dir = os.path.join(ws1.root, ramble.workspace.workspace_software_path)
+        software_base_dir = ws1.software_dir
         assert os.path.exists(software_base_dir)
         for software_dir in software_dirs:
-            software_path = os.path.join(software_base_dir, software_dir)
+            software_path = os.path.join(software_base_dir, "spack", software_dir)
             assert os.path.exists(software_path)
 
             spack_file = os.path.join(software_path, "spack.yaml")

lib/ramble/ramble/test/end_to_end/explicit_zips.py

@@ -158,10 +158,10 @@ def test_wrfv4_explicit_zips(mutable_config, mutable_mock_workspace_path):
 
         # Test software directories
         software_dirs = ["wrfv4", "wrfv4-portable"]
-        software_base_dir = os.path.join(ws1.root, ramble.workspace.workspace_software_path)
+        software_base_dir = ws1.software_dir
         assert os.path.exists(software_base_dir)
         for software_dir in software_dirs:
-            software_path = os.path.join(software_base_dir, software_dir)
+            software_path = os.path.join(software_base_dir, "spack", software_dir)
             assert os.path.exists(software_path)
 
             spack_file = os.path.join(software_path, "spack.yaml")

lib/ramble/ramble/test/end_to_end/included_configuration_files.py

@@ -146,10 +146,10 @@ def test_included_configuration_files(mutable_config, mutable_mock_workspace_pat
 
         # Test software directories
         software_dirs = ["wrfv4", "wrfv4-portable"]
-        software_base_dir = os.path.join(ws1.root, ramble.workspace.workspace_software_path)
+        software_base_dir = ws1.software_dir
         assert os.path.exists(software_base_dir)
         for software_dir in software_dirs:
-            software_path = os.path.join(software_base_dir, software_dir)
+            software_path = os.path.join(software_base_dir, "spack", software_dir)
             assert os.path.exists(software_path)
 
             spack_file = os.path.join(software_path, "spack.yaml")

lib/ramble/ramble/test/end_to_end/package_manager_config.py

@@ -60,7 +60,7 @@ def test_package_manager_config_zlib(mock_applications):
 
         workspace("setup", "--dry-run", global_args=["-w", workspace_name])
 
-        spack_yaml = os.path.join(ws.software_dir, "zlib-configs", "spack.yaml")
+        spack_yaml = os.path.join(ws.software_dir, "spack", "zlib-configs", "spack.yaml")
 
         assert os.path.isfile(spack_yaml)
 

lib/ramble/ramble/test/end_to_end/package_manager_requirements.py

@@ -71,7 +71,7 @@ def test_package_manager_requirements_zlib(mock_applications, mock_modifiers):
 
         workspace("setup", global_args=["-w", workspace_name])
 
-        spack_yaml = os.path.join(ws.software_dir, "zlib-configs", "spack.yaml")
+        spack_yaml = os.path.join(ws.software_dir, "spack", "zlib-configs", "spack.yaml")
 
         assert os.path.isfile(spack_yaml)
 

lib/ramble/ramble/test/end_to_end/spack_env_cache.py

@@ -91,9 +91,9 @@ def test_spack_env_cache():
         )
 
         # spack env should be present only at the env_name level.
-        assert os.path.exists(os.path.join(ws.software_dir, "gromacs"))
-        assert os.path.exists(os.path.join(ws.software_dir, "g2"))
-        assert not os.path.exists(os.path.join(ws.software_dir, "g2.water_bare"))
+        assert os.path.exists(os.path.join(ws.software_dir, "spack", "gromacs"))
+        assert os.path.exists(os.path.join(ws.software_dir, "spack", "g2"))
+        assert not os.path.exists(os.path.join(ws.software_dir, "spack", "g2.water_bare"))
 
         # First encounter of an env_name (test1 -> gromacs, test2 -> g2) requires spack usage.
         test1_log = os.path.join(ws.log_dir, "setup.latest", "gromacs.water_bare.test1.out")

lib/ramble/ramble/test/end_to_end/test_configvar_dry_run.py

@@ -98,7 +98,7 @@ def test_configvar_dry_run(mutable_config, mutable_mock_workspace_path):
         software_base_dir = os.path.join(ws.root, ramble.workspace.workspace_software_path)
         assert os.path.exists(software_base_dir)
 
-        software_path = os.path.join(software_base_dir, software_dir)
+        software_path = os.path.join(software_base_dir, "spack", software_dir)
         assert os.path.exists(software_path)
 
         for i, exp in enumerate(expected_experiments):

lib/ramble/ramble/test/end_to_end/wrfv4_dry_run.py

@@ -142,10 +142,10 @@ def test_wrfv4_spack_dry_run(mutable_config, mutable_mock_workspace_path):
 
         # Test software directories
         software_dirs = ["wrfv4", "wrfv4-portable"]
-        software_base_dir = os.path.join(ws1.root, ramble.workspace.workspace_software_path)
+        software_base_dir = ws1.software_dir
         assert os.path.exists(software_base_dir)
         for software_dir in software_dirs:
-            software_path = os.path.join(software_base_dir, software_dir)
+            software_path = os.path.join(software_base_dir, "spack", software_dir)
             assert os.path.exists(software_path)
 
             spack_file = os.path.join(software_path, "spack.yaml")

lib/ramble/ramble/test/modifier_application.py

@@ -78,7 +78,7 @@ def test_wrfv4_aps_test(mutable_config, mutable_mock_workspace_path):
 
         workspace("setup", "--dry-run", global_args=["-w", workspace_name])
 
-        software_path = os.path.join(ws1.software_dir, "wrfv4", "spack.yaml")
+        software_path = os.path.join(ws1.software_dir, "spack", "wrfv4", "spack.yaml")
         with open(software_path) as f:
             assert "intel-oneapi-vtune" in f.read()
 

lib/ramble/ramble/test/modifier_functionality/mock_env_var_modifiers.py

@@ -71,7 +71,7 @@ def test_gromacs_dry_run_mock_env_vars_mod(
         workspace("setup", "--dry-run", global_args=["-D", ws1.root])
 
         # Test software directories
-        software_base_dir = ws1.software_dir
+        software_base_dir = os.path.join(ws1.software_dir, "spack")
 
         modifier_helpers.check_software_env(software_base_dir, software_tests)
 

lib/ramble/ramble/test/modifier_functionality/mock_modifier_spack_configs.py

@@ -54,7 +54,7 @@ def test_gromacs_mock_spack_config_mod(
 
         assert os.path.isfile(exp_script)
 
-        spack_yaml = os.path.join(ws1.software_dir, "gromacs", "spack.yaml")
+        spack_yaml = os.path.join(ws1.software_dir, "spack", "gromacs", "spack.yaml")
         assert os.path.isfile(spack_yaml)
 
         with open(spack_yaml) as f:

lib/ramble/ramble/test/modifier_functionality/mock_spack_modifier.py

@@ -71,6 +71,6 @@ def test_gromacs_dry_run_mock_spack_mod(
         assert search_files_for_string(out_files, expected_str)
 
         # Test software directories
-        software_base_dir = ws1.software_dir
+        software_base_dir = os.path.join(ws1.software_dir, "spack")
 
         modifier_helpers.check_software_env(software_base_dir, software_tests)

lib/ramble/ramble/test/modifier_functionality/multi_modifier_dry_run.py

@@ -82,7 +82,7 @@ def test_gromacs_multi_modifier_dry_run(
         workspace("setup", "--dry-run", global_args=["-D", ws1.root])
 
         # Test software directories
-        software_base_dir = ws1.software_dir
+        software_base_dir = os.path.join(ws1.software_dir, "spack")
 
         modifier_helpers.check_software_env(software_base_dir, software_tests)
 

lib/ramble/ramble/test/modifier_functionality/single_modifier_dry_run.py

@@ -58,7 +58,7 @@ def test_gromacs_single_full_modifier_dry_run(
         workspace("setup", "--dry-run", global_args=["-D", ws1.root])
 
         # Test software directories
-        software_base_dir = ws1.software_dir
+        software_base_dir = os.path.join(ws1.software_dir, "spack")
 
         modifier_helpers.check_software_env(software_base_dir, software_tests)
 
@@ -109,7 +109,7 @@ def test_gromacs_single_stub_modifier_dry_run(
         workspace("setup", "--dry-run", global_args=["-D", ws1.root])
 
         # Test software directories
-        software_base_dir = ws1.software_dir
+        software_base_dir = os.path.join(ws1.software_dir, "spack")
 
         modifier_helpers.check_software_env(software_base_dir, software_tests)