From 23c82bcaf38e1f736ef2785bed4958ed50476312 Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Wed, 23 Aug 2023 11:20:12 +0200
Subject: [PATCH] explicitly test the environments installed before and after
remove
---
tests/test_mpsd_software.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/test_mpsd_software.py b/tests/test_mpsd_software.py
index 46967af..0a50331 100644
--- a/tests/test_mpsd_software.py
+++ b/tests/test_mpsd_software.py
@@ -759,9 +759,9 @@ def test_remove_package_sets(tmp_path, simple_toolchain):
release_dir = tmp_path / release_to_test / mod.get_native_microarchitecture()
assert len(list(release_dir.iterdir())) == 2 # spack and lmod
# check that the two toolchains are installed
- assert (
- len(list((release_dir / "spack" / "var" / "spack" / "environments").iterdir()))
- == 2
+ environments_dir = release_dir / "spack" / "var" / "spack" / "environments"
+ set([environment.name for environment in environments_dir.iterdir()]) == set(
+ ["toolchain1", "toolchain2"]
)
# check that the two toolchains have the "handmade" module files
toolchains_list = list(mod.environment_status(release_to_test, tmp_path).values())[
@@ -781,11 +781,11 @@ def test_remove_package_sets(tmp_path, simple_toolchain):
package_sets=["toolchain2"],
force_remove=True,
)
- # now check that only toolchain1 is installed
- assert (
- len(list((release_dir / "spack" / "var" / "spack" / "environments").iterdir()))
- == 1
+ # now check that only "toolchain1" is installed in environments_dir
+ assert set([environment.name for environment in environments_dir.iterdir()]) == set(
+ ["toolchain1"]
)
+
# check that the only one toolchains has the "handmade" module files
toolchains_list = list(mod.environment_status(release_to_test, tmp_path).values())[
0
--
GitLab