Merge branch 'tristan/test-element-states' into 'master'

Reduce number of calls to `bst show` in tests

See merge request BuildStream/buildstream!1103

1 files changed, 14 insertions, 10 deletions

diff --git a/tests/frontend/track.py b/tests/frontend/track.py
index d149bd050..8857294ac 100644
--- a/tests/frontend/track.py
+++ b/tests/frontend/track.py
@@ -123,7 +123,7 @@ def test_track_recurse(cli, tmpdir, datafiles, kind, amount):
         last_element_name = element_name
 
     # Assert that a fetch is needed
-    states = cli.get_element_states(project, last_element_name)
+    states = cli.get_element_states(project, [last_element_name])
     for element_name in element_names:
         assert states[element_name] == 'no reference'
 
@@ -143,7 +143,7 @@ def test_track_recurse(cli, tmpdir, datafiles, kind, amount):
     result.assert_success()
 
     # Assert that the base is buildable and the rest are waiting
-    states = cli.get_element_states(project, last_element_name)
+    states = cli.get_element_states(project, [last_element_name])
     for element_name in element_names:
         if element_name == element_names[0]:
             assert states[element_name] == 'buildable'
@@ -171,8 +171,9 @@ def test_track_single(cli, tmpdir, datafiles):
                      dep_name=element_dep_name)
 
     # Assert that tracking is needed for both elements
-    assert cli.get_element_state(project, element_dep_name) == 'no reference'
-    assert cli.get_element_state(project, element_target_name) == 'no reference'
+    states = cli.get_element_states(project, [element_target_name])
+    assert states[element_dep_name] == 'no reference'
+    assert states[element_target_name] == 'no reference'
 
     # Now first try to track only one element
     result = cli.run(project=project, args=[
@@ -187,8 +188,9 @@ def test_track_single(cli, tmpdir, datafiles):
     result.assert_success()
 
     # Assert that the dependency is waiting and the target has still never been tracked
-    assert cli.get_element_state(project, element_dep_name) == 'no reference'
-    assert cli.get_element_state(project, element_target_name) == 'waiting'
+    states = cli.get_element_states(project, [element_target_name])
+    assert states[element_dep_name] == 'no reference'
+    assert states[element_target_name] == 'waiting'
 
 
 @pytest.mark.datafiles(DATA_DIR)
@@ -212,8 +214,9 @@ def test_track_recurse_except(cli, tmpdir, datafiles, kind):
                      dep_name=element_dep_name)
 
     # Assert that a fetch is needed
-    assert cli.get_element_state(project, element_dep_name) == 'no reference'
-    assert cli.get_element_state(project, element_target_name) == 'no reference'
+    states = cli.get_element_states(project, [element_target_name])
+    assert states[element_dep_name] == 'no reference'
+    assert states[element_target_name] == 'no reference'
 
     # Now first try to track it
     result = cli.run(project=project, args=[
@@ -231,8 +234,9 @@ def test_track_recurse_except(cli, tmpdir, datafiles, kind):
     result.assert_success()
 
     # Assert that the dependency is buildable and the target is waiting
-    assert cli.get_element_state(project, element_dep_name) == 'no reference'
-    assert cli.get_element_state(project, element_target_name) == 'waiting'
+    states = cli.get_element_states(project, [element_target_name])
+    assert states[element_dep_name] == 'no reference'
+    assert states[element_target_name] == 'waiting'
 
 
 @pytest.mark.datafiles(os.path.join(TOP_DIR))