summaryrefslogtreecommitdiff
path: root/tests/frontend/show.py
diff options
context:
space:
mode:
authorTristan Maat <tristan.maat@codethink.co.uk>2019-09-16 11:56:01 +0100
committerTristan Maat <tristan.maat@codethink.co.uk>2019-10-10 12:21:15 +0100
commitbcbd1803151e24f411a11a788441c2da2686bf7a (patch)
treedc44ea6bba209746b1fdbaa92a4ee8714a3eb2d9 /tests/frontend/show.py
parent87110d6d42e3be6317c13e6e11388ae8dc8eaf4e (diff)
downloadbuildstream-bcbd1803151e24f411a11a788441c2da2686bf7a.tar.gz
Improve progress tests
Diffstat (limited to 'tests/frontend/show.py')
-rw-r--r--tests/frontend/show.py44
1 files changed, 0 insertions, 44 deletions
diff --git a/tests/frontend/show.py b/tests/frontend/show.py
index 0d444a925..bc51d2967 100644
--- a/tests/frontend/show.py
+++ b/tests/frontend/show.py
@@ -40,16 +40,6 @@ def test_show(cli, datafiles, target, fmt, expected):
.format(expected, result.output))
-@pytest.mark.datafiles(os.path.join(DATA_DIR, 'project'))
-def test_show_progress_tally(cli, datafiles):
- # Check that the progress reporting messages give correct tallies
- project = str(datafiles)
- result = cli.run(project=project, args=['show', 'compose-all.bst'])
- result.assert_success()
- assert " 3 subtasks processed" in result.stderr
- assert "3 of 3 subtasks processed" in result.stderr
-
-
@pytest.mark.datafiles(os.path.join(
os.path.dirname(os.path.realpath(__file__)),
"invalid_element_path",
@@ -397,40 +387,6 @@ def test_fetched_junction(cli, tmpdir, datafiles, element_name, workspaced):
assert 'junction.bst:import-etc.bst-buildable' in results
-@pytest.mark.datafiles(os.path.join(DATA_DIR, 'project'))
-def test_junction_tally(cli, tmpdir, datafiles):
- # Check that the progress reporting messages count elements in junctions
- project = str(datafiles)
- subproject_path = os.path.join(project, 'files', 'sub-project')
- junction_path = os.path.join(project, 'elements', 'junction.bst')
- element_path = os.path.join(project, 'elements', 'junction-dep.bst')
-
- # Create a repo to hold the subproject and generate a junction element for it
- generate_junction(tmpdir, subproject_path, junction_path, store_ref=True)
-
- # Create a stack element to depend on a cross junction element
- #
- element = {
- 'kind': 'stack',
- 'depends': [
- {
- 'junction': 'junction.bst',
- 'filename': 'import-etc.bst'
- }
- ]
- }
- _yaml.roundtrip_dump(element, element_path)
-
- result = cli.run(project=project, silent=True, args=[
- 'source', 'fetch', 'junction.bst'])
- result.assert_success()
-
- # Assert the correct progress tallies are in the logging
- result = cli.run(project=project, args=['show', 'junction-dep.bst'])
- assert " 2 subtasks processed" in result.stderr
- assert "2 of 2 subtasks processed" in result.stderr
-
-
###############################################################
# Testing recursion depth #
###############################################################