diff --git a/tests.py b/tests.py index fd4e0b9e8202b3c863791db4d4c26af57366d868..c16d60bfe2dcff1427962194c7f8e6023a7c69cb 100644 --- a/tests.py +++ b/tests.py @@ -94,17 +94,19 @@ def test_prepare_environment(tmp_path): assert release_base_dir.exists() # check for spack-environments directory assert spack_environments in os.listdir(release_base_dir) - # check if the git branch is correctly checked out - assert ( + + # check if the git branch is correctly checked out. We expect output such as + # git_branch_stdout = '* dev-23a\n develop\n' + # The entry with the '* ' prefix is the active branch. + git_branch_output_raw = \ subprocess.run( f"cd {str(release_base_dir/spack_environments)} && git branch", shell=True, capture_output=True, ) - .stdout.decode("utf-8") - .split("\n")[0] - == f"* {mpsd_release_to_test}" - ) + git_branch_stdout = git_branch_output_raw.stdout.decode("utf-8") + assert f"* {mpsd_release_to_test}" in git_branch_stdout + # check that result is a list and contains atleast ['global','foss2021a-mpi'] assert isinstance(result, list) assert "global" in result