summaryrefslogtreecommitdiff
path: root/tests/format
diff options
context:
space:
mode:
authorJames Ennis <james.ennis@codethink.com>2019-01-09 12:36:02 +0000
committerJames Ennis <james.ennis@codethink.com>2019-01-22 12:32:43 +0000
commitfbd159390e97a26f85bb7e8d6284b14bb77083ff (patch)
tree78eb6130d68ceedca256fc6f71f6c19d645abe64 /tests/format
parent9eefe8634a95f181593f4f4b3b18564dd0fa0693 (diff)
downloadbuildstream-fbd159390e97a26f85bb7e8d6284b14bb77083ff.tar.gz
Mark 'old' checkout command as obsolete
This commit marks 'bst checkout' as a 'hidden' command. If used, the user will be prompted to use the new 'bst artifact checkout' command. All tests which used 'bst checkout' have been modified to use the new artifact sub-command. This partially solves #822.
Diffstat (limited to 'tests/format')
-rw-r--r--tests/format/junctions.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/format/junctions.py b/tests/format/junctions.py
index d97c9f702..90608d0fc 100644
--- a/tests/format/junctions.py
+++ b/tests/format/junctions.py
@@ -39,7 +39,7 @@ def test_simple_build(cli, tmpdir, datafiles):
# Build, checkout
result = cli.run(project=project, args=['build', 'target.bst'])
result.assert_success()
- result = cli.run(project=project, args=['checkout', 'target.bst', checkoutdir])
+ result = cli.run(project=project, args=['artifact', 'checkout', 'target.bst', '--directory', checkoutdir])
result.assert_success()
# Check that the checkout contains the expected files from both projects
@@ -70,7 +70,7 @@ def test_nested_simple(cli, tmpdir, datafiles):
# Build, checkout
result = cli.run(project=project, args=['build', 'target.bst'])
result.assert_success()
- result = cli.run(project=project, args=['checkout', 'target.bst', checkoutdir])
+ result = cli.run(project=project, args=['artifact', 'checkout', 'target.bst', '--directory', checkoutdir])
result.assert_success()
# Check that the checkout contains the expected files from all subprojects
@@ -94,7 +94,7 @@ def test_nested_double(cli, tmpdir, datafiles):
# Build, checkout
result = cli.run(project=project, args=['build', 'target.bst'])
result.assert_success()
- result = cli.run(project=project, args=['checkout', 'target.bst', checkoutdir])
+ result = cli.run(project=project, args=['artifact', 'checkout', 'target.bst', '--directory', checkoutdir])
result.assert_success()
# Check that the checkout contains the expected files from all subprojects
@@ -167,7 +167,7 @@ def test_options_default(cli, tmpdir, datafiles):
# Build, checkout
result = cli.run(project=project, args=['build', 'target.bst'])
result.assert_success()
- result = cli.run(project=project, args=['checkout', 'target.bst', checkoutdir])
+ result = cli.run(project=project, args=['artifact', 'checkout', 'target.bst', '--directory', checkoutdir])
result.assert_success()
assert(os.path.exists(os.path.join(checkoutdir, 'pony.txt')))
@@ -184,7 +184,7 @@ def test_options(cli, tmpdir, datafiles):
# Build, checkout
result = cli.run(project=project, args=['build', 'target.bst'])
result.assert_success()
- result = cli.run(project=project, args=['checkout', 'target.bst', checkoutdir])
+ result = cli.run(project=project, args=['artifact', 'checkout', 'target.bst', '--directory', checkoutdir])
result.assert_success()
assert(not os.path.exists(os.path.join(checkoutdir, 'pony.txt')))
@@ -201,7 +201,7 @@ def test_options_inherit(cli, tmpdir, datafiles):
# Build, checkout
result = cli.run(project=project, args=['build', 'target.bst'])
result.assert_success()
- result = cli.run(project=project, args=['checkout', 'target.bst', checkoutdir])
+ result = cli.run(project=project, args=['artifact', 'checkout', 'target.bst', '--directory', checkoutdir])
result.assert_success()
assert(not os.path.exists(os.path.join(checkoutdir, 'pony.txt')))
@@ -262,7 +262,7 @@ def test_git_build(cli, tmpdir, datafiles):
# Build (with implicit fetch of subproject), checkout
result = cli.run(project=project, args=['build', 'target.bst'])
result.assert_success()
- result = cli.run(project=project, args=['checkout', 'target.bst', checkoutdir])
+ result = cli.run(project=project, args=['artifact', 'checkout', 'target.bst', '--directory', checkoutdir])
result.assert_success()
# Check that the checkout contains the expected files from both projects
@@ -303,7 +303,7 @@ def test_build_git_cross_junction_names(cli, tmpdir, datafiles):
# Build (with implicit fetch of subproject), checkout
result = cli.run(project=project, args=['build', 'base.bst:target.bst'])
result.assert_success()
- result = cli.run(project=project, args=['checkout', 'base.bst:target.bst', checkoutdir])
+ result = cli.run(project=project, args=['artifact', 'checkout', 'base.bst:target.bst', '--directory', checkoutdir])
result.assert_success()
# Check that the checkout contains the expected files from both projects