diff options
author | Colin Walters <walters@verbum.org> | 2017-09-01 16:15:33 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-09-01 20:54:12 +0000 |
commit | 88b25dc65c5e2392a732c157cf43fa3dfac5e191 (patch) | |
tree | ed75877fd19b73fe4a1345033aff554917009858 /tests/test-local-pull.sh | |
parent | f07432d4cefcea7fb8c602b9ab78e83236127d8f (diff) | |
download | ostree-88b25dc65c5e2392a732c157cf43fa3dfac5e191.tar.gz |
tree-wide: Replace archive-z2 with archive
In almost all places. There are just a few exceptions; one tricky bit for
example is that the repo config must still have `mode=archive-z2`, since
`archive` used to mean something else. (We could very likely just get rid of
that check, but eh, later).
I also added a test that one can still do `ostree repo init --mode=archive-z2`.
Closes: #1125
Approved by: jlebon
Diffstat (limited to 'tests/test-local-pull.sh')
-rwxr-xr-x | tests/test-local-pull.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test-local-pull.sh b/tests/test-local-pull.sh index 1c9767f6..f9ac63b6 100755 --- a/tests/test-local-pull.sh +++ b/tests/test-local-pull.sh @@ -28,7 +28,7 @@ skip_without_user_xattrs echo "1..8" -setup_test_repository "archive-z2" +setup_test_repository "archive" echo "ok setup" cd ${test_tmpdir} @@ -40,7 +40,7 @@ ${CMD_PREFIX} ostree --repo=repo2 fsck echo "ok pull-local z2 to bare-user" mkdir repo3 -ostree_repo_init repo3 --mode="archive-z2" +ostree_repo_init repo3 --mode="archive" ${CMD_PREFIX} ostree --repo=repo3 pull-local repo2 ${CMD_PREFIX} ostree --repo=repo3 fsck echo "ok pull-local bare-user to z2" @@ -62,7 +62,7 @@ cmp checkout1.files checkout3.files echo "ok checkouts same" mkdir repo4 -ostree_repo_init repo4 --mode="archive-z2" +ostree_repo_init repo4 --mode="archive" ${CMD_PREFIX} ostree --repo=repo4 remote add --gpg-import ${test_tmpdir}/gpghome/key1.asc origin repo if ${CMD_PREFIX} ostree --repo=repo4 pull-local --remote=origin --gpg-verify repo test2 2>&1; then assert_not_reached "GPG verification unexpectedly succeeded" @@ -72,13 +72,13 @@ echo "ok --gpg-verify with no signature" ${OSTREE} gpg-sign --gpg-homedir=${TEST_GPG_KEYHOME} test2 ${TEST_GPG_KEYID_1} mkdir repo5 -ostree_repo_init repo5 --mode="archive-z2" +ostree_repo_init repo5 --mode="archive" ${CMD_PREFIX} ostree --repo=repo5 remote add --gpg-import ${test_tmpdir}/gpghome/key1.asc origin repo ${CMD_PREFIX} ostree --repo=repo5 pull-local --remote=origin --gpg-verify repo test2 echo "ok --gpg-verify" mkdir repo6 -ostree_repo_init repo6 --mode="archive-z2" +ostree_repo_init repo6 --mode="archive" ${CMD_PREFIX} ostree --repo=repo6 remote add --gpg-import ${test_tmpdir}/gpghome/key1.asc origin repo if ${CMD_PREFIX} ostree --repo=repo6 pull-local --remote=origin --gpg-verify-summary repo test2 2>&1; then assert_not_reached "GPG summary verification with no summary unexpectedly succeeded" @@ -97,7 +97,7 @@ ${CMD_PREFIX} ostree --repo=repo6 pull-local --remote=origin --gpg-verify-summar echo "ok --gpg-verify-summary" mkdir repo7 -ostree_repo_init repo7 --mode="archive-z2" +ostree_repo_init repo7 --mode="archive" ${CMD_PREFIX} ostree --repo=repo7 pull-local repo ${CMD_PREFIX} ostree --repo=repo7 fsck for src_object in `find repo/objects -name '*.filez'`; do |