Skip to content

Commit 44bce84

Browse files
committed
Update spack-ext unit tests
1 parent ce21e16 commit 44bce84

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

spack-ext/lib/jcsda-emc/spack-stack/tests/test_setup_meta_modules.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ def test_setup_meta_modules():
4747

4848
packages_definition = """
4949
packages:
50-
all:
51-
prefer:
52-
- "%[when=%c]c=gcc %[when=%cxx]cxx=gcc %[when=%fortran]fortran=gcc"
5350
gcc:
5451
externals:
5552
- spec: [email protected] languages:='c,c++,fortran'
@@ -63,12 +60,7 @@ def test_setup_meta_modules():
6360
buildable: false
6461
openmpi:
6562
externals:
66-
67-
prefix: /usr
68-
python:
69-
buildable: false
70-
externals:
71-
63+
- spec: [email protected] ~internal-hwloc +two_level_namespace
7264
prefix: /usr
7365
"""
7466
site_packages_yaml = os.path.join(env_dir, "site", "packages.yaml")
@@ -77,8 +69,14 @@ def test_setup_meta_modules():
7769
with open(site_packages_yaml, 'w') as f:
7870
f.write(packages_definition)
7971

72+
cmd = spack.main.SpackCommand("concretize")
73+
cmd("--force", "--fresh")
74+
8075
cmd = spack.main.SpackCommand("install")
81-
cmd("--add", "--no-cache", "gcc", "openmpi", "python")
76+
cmd("--add", "--no-cache", "gcc", "openmpi")
77+
78+
cmd = spack.main.SpackCommand("module")
79+
cmd("tcl", "refresh", "--yes")
8280

8381
spack_stack_cmd("setup-meta-modules")
8482

@@ -88,4 +86,8 @@ def test_setup_meta_modules():
8886
f"Expected module {expected_comp_meta_module} not found"
8987
)
9088

91-
expected_mpi_meta_module = os.path.join(module_dir, "gcc", "13.2.1", "stack-openmpi", "4.1.8")
89+
expected_mpi_meta_module = os.path.join(module_dir, "gcc", "11.5.0", "stack-openmpi", "5.0.8")
90+
assert(
91+
os.path.exists(expected_mpi_meta_module),
92+
f"Expected module {expected_mpi_meta_module} not found"
93+
)

spack-ext/lib/jcsda-emc/spack-stack/tests/test_stack_create.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def test_modules():
165165
@pytest.mark.extension("stack")
166166
@pytest.mark.filterwarnings("ignore::UserWarning")
167167
def test_compilers():
168-
for compiler in ["gcc-13.2.1", "oneapi-2025.1.0"]:
168+
for compiler in ["gcc-13.2.1", "oneapi-2024.2.1"]:
169169
if os.path.exists(test_dir):
170170
shutil.rmtree(test_dir)
171171
stack_create(

0 commit comments

Comments
 (0)