diff --git a/tests/test_mpsd_software.py b/tests/test_mpsd_software.py index d119fcbb8d2ba76d0227c88eb4b0003b7305e6a5..85b834d143cba06670c8ab9b5362e76f97977d31 100644 --- a/tests/test_mpsd_software.py +++ b/tests/test_mpsd_software.py @@ -804,13 +804,16 @@ def test_remove_package_sets(tmp_path, simple_toolchain): def test_remove_global_package_sets(): """Test removal of global package_sets via spack.""" root_dir = Path("/tmp/test_global_generic") + release_to_test = "dev-23a" if not root_dir.exists(): # we need the sample spack instance with global_generic # this is already done in test_install_environment_zlib # so we just need to call it test_install_environment_zlib() # check that zlib and zstd are installed - spack_dir = root_dir / "dev-23a" / mod.get_native_microarchitecture() / "spack" + spack_dir = ( + root_dir / release_to_test / mod.get_native_microarchitecture() / "spack" + ) source_spack = ( f"export SPACK_DIR={spack_dir} &&" f'. {spack_dir / "share" / "spack" / "setup-env.sh"}' @@ -824,7 +827,7 @@ def test_remove_global_package_sets(): # remove global_generic mod.remove_environment( - mpsd_release="dev-23a", + mpsd_release=release_to_test, root_dir=root_dir, package_sets=["global_generic"], force_remove=True, @@ -842,6 +845,16 @@ def test_remove_global_package_sets(): shell=True, check=True, ) + # check that the logs directory contains a build log for remove cmd + # dev-23a_zen3_2023-08-11T15-55-54_BUILD_toolchain2_remove.log + logs_dir = root_dir / release_to_test / "logs" + # remove_build_log is the last log file in the list + remove_build_log = sorted(list(logs_dir.iterdir()))[-1] + assert "global_generic_remove.log" in remove_build_log.name + with open(remove_build_log, "r") as f: + logs = f.read() + assert "==> Successfully uninstalled zstd" in logs + assert "==> Successfully uninstalled zlib" in logs def test_interface(tmp_path):