summaryrefslogtreecommitdiff
path: root/tests/sources
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/sources
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/sources')
-rw-r--r--tests/sources/bzr.py2
-rw-r--r--tests/sources/deb.py6
-rw-r--r--tests/sources/git.py20
-rw-r--r--tests/sources/local.py6
-rw-r--r--tests/sources/patch.py8
-rw-r--r--tests/sources/previous_source_access.py2
-rw-r--r--tests/sources/remote.py8
-rw-r--r--tests/sources/tar.py12
-rw-r--r--tests/sources/zip.py8
9 files changed, 36 insertions, 36 deletions
diff --git a/tests/sources/bzr.py b/tests/sources/bzr.py
index 9895180e0..a56005f5e 100644
--- a/tests/sources/bzr.py
+++ b/tests/sources/bzr.py
@@ -36,7 +36,7 @@ def test_fetch_checkout(cli, tmpdir, datafiles):
assert result.exit_code == 0
result = cli.run(project=project, args=['build', 'target.bst'])
assert result.exit_code == 0
- result = cli.run(project=project, args=['checkout', 'target.bst', checkoutdir])
+ result = cli.run(project=project, args=['artifact', 'checkout', 'target.bst', '--directory', checkoutdir])
assert result.exit_code == 0
# Assert we checked out the file as it was commited
diff --git a/tests/sources/deb.py b/tests/sources/deb.py
index b925fc9e9..b40358eaa 100644
--- a/tests/sources/deb.py
+++ b/tests/sources/deb.py
@@ -114,7 +114,7 @@ def test_stage_default_basedir(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()
# Check that the content of the first directory is checked out (base-dir: '')
@@ -142,7 +142,7 @@ def test_stage_no_basedir(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()
# Check that the full content of the tarball is checked out (base-dir: '')
@@ -170,7 +170,7 @@ def test_stage_explicit_basedir(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()
# Check that the content of the first directory is checked out (base-dir: '')
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'],
diff --git a/tests/sources/local.py b/tests/sources/local.py
index de12473d9..4a0851d72 100644
--- a/tests/sources/local.py
+++ b/tests/sources/local.py
@@ -77,7 +77,7 @@ def test_stage_file(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 file
@@ -92,7 +92,7 @@ def test_stage_directory(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 file and directory and other file
@@ -117,7 +117,7 @@ def test_stage_symlink(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 file and directory and other file
diff --git a/tests/sources/patch.py b/tests/sources/patch.py
index 39d43369d..51ae69021 100644
--- a/tests/sources/patch.py
+++ b/tests/sources/patch.py
@@ -75,7 +75,7 @@ def test_stage_and_patch(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()
# Test the file.txt was patched and changed
@@ -113,7 +113,7 @@ def test_stage_separate_patch_dir(cli, tmpdir, datafiles):
# Track, fetch, 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()
# Test the file.txt was patched and changed
@@ -129,7 +129,7 @@ def test_stage_multiple_patches(cli, tmpdir, datafiles):
# Track, fetch, 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()
# Test the file.txt was patched and changed
@@ -145,7 +145,7 @@ def test_patch_strip_level(cli, tmpdir, datafiles):
# Track, fetch, 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()
# Test the file.txt was patched and changed
diff --git a/tests/sources/previous_source_access.py b/tests/sources/previous_source_access.py
index f090ac8a0..26640d180 100644
--- a/tests/sources/previous_source_access.py
+++ b/tests/sources/previous_source_access.py
@@ -35,7 +35,7 @@ def test_custom_transform_source(cli, tmpdir, datafiles):
])
destpath = os.path.join(cli.directory, 'checkout')
result = cli.run(project=project, args=[
- 'checkout', 'target.bst', destpath
+ 'artifact', 'checkout', 'target.bst', '--directory', destpath
])
result.assert_success()
# Assert that files from both sources exist, and that they have
diff --git a/tests/sources/remote.py b/tests/sources/remote.py
index 6062c9cbc..b8cf049b3 100644
--- a/tests/sources/remote.py
+++ b/tests/sources/remote.py
@@ -89,7 +89,7 @@ def test_simple_file_build(cli, tmpdir, datafiles):
result.assert_success()
result = cli.run(project=project, args=[
- 'checkout', 'target.bst', checkoutdir
+ 'artifact', 'checkout', 'target.bst', '--directory', checkoutdir
])
result.assert_success()
# Note that the url of the file in target.bst is actually /dir/file
@@ -122,7 +122,7 @@ def test_simple_file_custom_name_build(cli, tmpdir, datafiles):
result.assert_success()
result = cli.run(project=project, args=[
- 'checkout', 'target.bst', checkoutdir
+ 'artifact', 'checkout', 'target.bst', '--directory', checkoutdir
])
result.assert_success()
assert(not os.path.exists(os.path.join(checkoutdir, 'file')))
@@ -169,7 +169,7 @@ def test_executable(cli, tmpdir, datafiles):
])
result = cli.run(project=project, args=[
- 'checkout', 'target-custom-executable.bst', checkoutdir
+ 'artifact', 'checkout', 'target-custom-executable.bst', '--directory', checkoutdir
])
mode = os.stat(os.path.join(checkoutdir, 'some-custom-file')).st_mode
assert (mode & stat.S_IEXEC)
@@ -202,7 +202,7 @@ def test_use_netrc(cli, datafiles, server_type, tmpdir):
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()
checkout_file = os.path.join(checkoutdir, 'file')
diff --git a/tests/sources/tar.py b/tests/sources/tar.py
index 35eb8375e..406d6702b 100644
--- a/tests/sources/tar.py
+++ b/tests/sources/tar.py
@@ -139,7 +139,7 @@ def test_stage_default_basedir(cli, tmpdir, datafiles, srcdir):
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()
# Check that the content of the first directory is checked out (base-dir: '*')
@@ -168,7 +168,7 @@ def test_stage_no_basedir(cli, tmpdir, datafiles, srcdir):
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()
# Check that the full content of the tarball is checked out (base-dir: '')
@@ -197,7 +197,7 @@ def test_stage_explicit_basedir(cli, tmpdir, datafiles, srcdir):
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()
# Check that the content of the first directory is checked out (base-dir: '*')
@@ -233,7 +233,7 @@ def test_stage_contains_links(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()
# Check that the content of the first directory is checked out (base-dir: '*')
@@ -262,7 +262,7 @@ def test_stage_default_basedir_lzip(cli, tmpdir, datafiles, srcdir):
result.assert_success()
result = cli.run(project=project, args=['build', 'target-lz.bst'])
result.assert_success()
- result = cli.run(project=project, args=['checkout', 'target-lz.bst', checkoutdir])
+ result = cli.run(project=project, args=['artifact', 'checkout', 'target-lz.bst', '--directory', checkoutdir])
result.assert_success()
# Check that the content of the first directory is checked out (base-dir: '*')
@@ -348,7 +348,7 @@ def test_use_netrc(cli, datafiles, server_type, tmpdir):
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()
original_dir = os.path.join(str(datafiles), 'content', 'a')
diff --git a/tests/sources/zip.py b/tests/sources/zip.py
index 36e033427..009862e1c 100644
--- a/tests/sources/zip.py
+++ b/tests/sources/zip.py
@@ -123,7 +123,7 @@ def test_stage_default_basedir(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()
# Check that the content of the first directory is checked out (base-dir: '*')
@@ -151,7 +151,7 @@ def test_stage_no_basedir(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()
# Check that the full content of the tarball is checked out (base-dir: '')
@@ -179,7 +179,7 @@ def test_stage_explicit_basedir(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()
# Check that the content of the first directory is checked out (base-dir: '*')
@@ -221,7 +221,7 @@ def test_use_netrc(cli, datafiles, server_type, tmpdir):
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()
original_dir = os.path.join(str(datafiles), 'content', 'a')