diff options
| author | James Ennis <james.ennis@codethink.com> | 2019-01-09 12:36:02 +0000 |
|---|---|---|
| committer | James Ennis <james.ennis@codethink.com> | 2019-01-22 12:32:43 +0000 |
| commit | fbd159390e97a26f85bb7e8d6284b14bb77083ff (patch) | |
| tree | 78eb6130d68ceedca256fc6f71f6c19d645abe64 /tests/sources/git.py | |
| parent | 9eefe8634a95f181593f4f4b3b18564dd0fa0693 (diff) | |
| download | buildstream-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/sources/git.py')
| -rw-r--r-- | tests/sources/git.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/sources/git.py b/tests/sources/git.py index f194e9f54..795908329 100644 --- a/tests/sources/git.py +++ b/tests/sources/git.py @@ -95,7 +95,7 @@ def test_submodule_fetch_checkout(cli, tmpdir, datafiles): result.assert_success() 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 we checked out both files at their expected location @@ -134,7 +134,7 @@ def test_submodule_fetch_source_enable_explicit(cli, tmpdir, datafiles): result.assert_success() 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 we checked out both files at their expected location @@ -173,7 +173,7 @@ def test_submodule_fetch_source_disable(cli, tmpdir, datafiles): result.assert_success() 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 we checked out both files at their expected location @@ -212,7 +212,7 @@ def test_submodule_fetch_submodule_does_override(cli, tmpdir, datafiles): result.assert_success() 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 we checked out both files at their expected location @@ -256,7 +256,7 @@ def test_submodule_fetch_submodule_individual_checkout(cli, tmpdir, datafiles): result.assert_success() 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 we checked out files at their expected location @@ -301,7 +301,7 @@ def test_submodule_fetch_submodule_individual_checkout_explicit(cli, tmpdir, dat result.assert_success() 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 we checked out files at their expected location @@ -341,7 +341,7 @@ def test_submodule_fetch_project_override(cli, tmpdir, datafiles): result.assert_success() 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 we checked out both files at their expected location @@ -860,7 +860,7 @@ def test_git_describe(cli, tmpdir, datafiles, ref_storage, tag_type): result = cli.run(project=project, args=['build', 'target.bst']) result.assert_success() - result = cli.run(project=project, args=['checkout', 'target.bst', checkout]) + result = cli.run(project=project, args=['artifact', 'checkout', 'target.bst', '--directory', checkout]) result.assert_success() if tag_type == 'annotated': @@ -970,7 +970,7 @@ def test_git_describe_head_is_tagged(cli, tmpdir, datafiles, ref_storage, tag_ty result = cli.run(project=project, args=['build', 'target.bst']) result.assert_success() - result = cli.run(project=project, args=['checkout', 'target.bst', checkout]) + result = cli.run(project=project, args=['artifact', 'checkout', 'target.bst', '--directory', checkout]) result.assert_success() if tag_type == 'annotated': @@ -1061,7 +1061,7 @@ def test_git_describe_relevant_history(cli, tmpdir, datafiles): result = cli.run(project=project, args=['build', 'target.bst']) result.assert_success() - result = cli.run(project=project, args=['checkout', 'target.bst', checkout]) + result = cli.run(project=project, args=['artifact', 'checkout', 'target.bst', '--directory', checkout]) result.assert_success() describe = subprocess.check_output(['git', 'describe'], |