summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandan Singh <csingh43@bloomberg.net>2019-04-10 18:03:15 +0100
committerChandan Singh <csingh43@bloomberg.net>2019-04-10 18:03:15 +0100
commita0350d473fe88c1f40113a5b4e8255149def2177 (patch)
treed93b20f37a330cdb890bf75f3f8d3f4ec73efa35
parentb9cdf82c6c33d18ae08d17dce5fa041486893ec0 (diff)
downloadbuildstream-a0350d473fe88c1f40113a5b4e8255149def2177.tar.gz
tests: Fix all remaining references to bst pull
As the `bst pull` is now called `bst artifact pull`, update the remaining comments in testsuite that still refer to it as `bst pull`.
-rw-r--r--tests/artifactcache/junctions.py2
-rw-r--r--tests/frontend/pull.py18
-rw-r--r--tests/integration/pullbuildtrees.py2
3 files changed, 11 insertions, 11 deletions
diff --git a/tests/artifactcache/junctions.py b/tests/artifactcache/junctions.py
index 6655a4f1d..cf655a93b 100644
--- a/tests/artifactcache/junctions.py
+++ b/tests/artifactcache/junctions.py
@@ -77,7 +77,7 @@ def test_push_pull(cli, tmpdir, datafiles):
state = cli.get_element_state(base_project, 'target.bst')
assert state != 'cached'
- # Now try bst pull
+ # Now try bst artifact pull
result = cli.run(project=project, args=['artifact', 'pull', '--deps', 'all', 'target.bst'])
assert result.exit_code == 0
diff --git a/tests/frontend/pull.py b/tests/frontend/pull.py
index a2cbffa04..de12e1d6b 100644
--- a/tests/frontend/pull.py
+++ b/tests/frontend/pull.py
@@ -44,7 +44,7 @@ def assert_not_shared(cli, share, project, element_name):
# Tests that:
#
# * `bst build` pushes all build elements to configured 'push' cache
-# * `bst pull --deps all` downloads everything from cache after local deletion
+# * `bst artifact pull --deps all` downloads everything from cache after local deletion
#
@pytest.mark.datafiles(DATA_DIR)
def test_push_pull_all(cli, tmpdir, datafiles):
@@ -75,7 +75,7 @@ def test_push_pull_all(cli, tmpdir, datafiles):
states = cli.get_element_states(project, all_elements)
assert not any(states[e] == 'cached' for e in all_elements)
- # Now try bst pull
+ # Now try bst artifact pull
result = cli.run(project=project, args=['artifact', 'pull', '--deps', 'all', 'target.bst'])
result.assert_success()
@@ -87,7 +87,7 @@ def test_push_pull_all(cli, tmpdir, datafiles):
# Tests that:
#
# * `bst push` (default targets) pushes all built elements to configured 'push' cache
-# * `bst pull` (default targets) downloads everything from cache after local deletion
+# * `bst artifact pull` (default targets) downloads everything from cache after local deletion
#
@pytest.mark.datafiles(DATA_DIR + '_world')
def test_push_pull_default_targets(cli, tmpdir, datafiles):
@@ -125,7 +125,7 @@ def test_push_pull_default_targets(cli, tmpdir, datafiles):
states = cli.get_element_states(project, all_elements)
assert not any(states[e] == 'cached' for e in all_elements)
- # Now try bst pull
+ # Now try bst artifact pull
result = cli.run(project=project, args=['artifact', 'pull'])
result.assert_success()
@@ -137,7 +137,7 @@ def test_push_pull_default_targets(cli, tmpdir, datafiles):
# Tests that:
#
# * `bst build` pushes all build elements ONLY to configured 'push' cache
-# * `bst pull` finds artifacts that are available only in the secondary cache
+# * `bst artifact pull` finds artifacts that are available only in the secondary cache
#
@pytest.mark.datafiles(DATA_DIR)
def test_pull_secondary_cache(cli, tmpdir, datafiles):
@@ -166,7 +166,7 @@ def test_pull_secondary_cache(cli, tmpdir, datafiles):
# Assert that the element is not cached anymore.
assert cli.get_element_state(project, 'target.bst') != 'cached'
- # Now try bst pull
+ # Now try bst artifact pull
result = cli.run(project=project, args=['artifact', 'pull', 'target.bst'])
result.assert_success()
@@ -178,7 +178,7 @@ def test_pull_secondary_cache(cli, tmpdir, datafiles):
# Tests that:
#
# * `bst push --remote` pushes to the given remote, not one from the config
-# * `bst pull --remote` pulls from the given remote
+# * `bst artifact pull --remote` pulls from the given remote
#
@pytest.mark.datafiles(DATA_DIR)
def test_push_pull_specific_remote(cli, tmpdir, datafiles):
@@ -269,7 +269,7 @@ def test_push_pull_non_strict(cli, tmpdir, datafiles):
# Assert that the target is still waiting due to --no-strict
assert cli.get_element_state(project, 'target.bst') == 'waiting'
- # Now try bst pull
+ # Now try bst artifact pull
result = cli.run(project=project, args=['artifact', 'pull', '--deps', 'all', 'target.bst'])
result.assert_success()
@@ -344,7 +344,7 @@ def test_push_pull_cross_junction(cli, tmpdir, datafiles):
assert cli.get_element_state(project, 'junction.bst:import-etc.bst') == 'buildable'
- # Now try bst pull
+ # Now try bst artifact pull
result = cli.run(project=project, args=['artifact', 'pull', 'junction.bst:import-etc.bst'])
result.assert_success()
diff --git a/tests/integration/pullbuildtrees.py b/tests/integration/pullbuildtrees.py
index 1a89f776a..5eb835cd3 100644
--- a/tests/integration/pullbuildtrees.py
+++ b/tests/integration/pullbuildtrees.py
@@ -147,7 +147,7 @@ def test_pullbuildtrees(cli2, tmpdir, datafiles):
# Assert that if we add an extra remote that has the buildtree artfact cached, bst push will
# automatically attempt to pull it and will be successful, leading to the full artifact being pushed
# to the empty share3. This gives the ability to attempt push currently partial artifacts to a remote,
- # without exlipictly requiring a bst pull.
+ # without exlipictly requiring a bst artifact pull.
cli2.configure({'artifacts': [{'url': share1.repo, 'push': False}, {'url': share3.repo, 'push': True}]})
result = cli2.run(project=project, args=['--pull-buildtrees', 'artifact', 'push', element_name])
assert "Attempting to fetch missing artifact buildtrees" in result.stderr