fixup! tests:workspace: make deeper tests when trying to build all

1 files changed, 5 insertions, 9 deletions

diff --git a/tests/frontend/workspace.py b/tests/frontend/workspace.py
index 31569a46f..886f4114d 100644
--- a/tests/frontend/workspace.py
+++ b/tests/frontend/workspace.py
@@ -1255,6 +1255,7 @@ def test_build_all(cli, tmpdir, datafiles, case, strict, non_workspaced_elements
     project = os.path.join(str(datafiles), case)
     workspace = os.path.join(str(tmpdir), 'workspace')
     non_leaf_elements = ["elem2.bst", "elem3.bst", "stack.bst", "elem4.bst"]
+    all_elements = ["elem1.bst", *non_leaf_elements]
 
     # Configure strict mode
     strict_mode = True
@@ -1273,18 +1274,13 @@ def test_build_all(cli, tmpdir, datafiles, case, strict, non_workspaced_elements
     result.assert_success()
 
     # Ensure all elements are waiting build the first
-    assert cli.get_element_state(project, 'elem1.bst') == 'buildable'
-    assert [
-        cli.get_element_state(project, element)
-        for element in non_leaf_elements
-    ] == non_workspaced_elements_state
+    assert cli.get_element_states(project, all_elements) == \
+        dict(zip(all_elements, ['buildable', *non_workspaced_elements_state]))
 
     # Now build the target elem3.bst
     result = cli.run(project=project, args=['build', 'elem4.bst'])
     result.assert_success()
 
     # Assert that the target is built
-    assert [
-        cli.get_element_state(project, element)
-        for element in ["elem1.bst", *non_leaf_elements]
-    ] == ["cached"] * (len(non_leaf_elements) + 1)
+    assert cli.get_element_states(project, all_elements) == \
+        {elem: "cached" for elem in all_elements}