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-pull-mirror-summary.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-pull-mirror-summary.sh')
| -rwxr-xr-x | tests/test-pull-mirror-summary.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test-pull-mirror-summary.sh b/tests/test-pull-mirror-summary.sh index 883c0245..71f917fc 100755 --- a/tests/test-pull-mirror-summary.sh +++ b/tests/test-pull-mirror-summary.sh @@ -24,7 +24,7 @@ set -euo pipefail echo "1..5" COMMIT_SIGN="--gpg-homedir=${TEST_GPG_KEYHOME} --gpg-sign=${TEST_GPG_KEYID_1}" -setup_fake_remote_repo1 "archive-z2" "${COMMIT_SIGN}" +setup_fake_remote_repo1 "archive" "${COMMIT_SIGN}" # Now, setup multiple branches mkdir ${test_tmpdir}/ostree-srv/other-files @@ -41,7 +41,7 @@ ${CMD_PREFIX} ostree --repo=${test_tmpdir}/ostree-srv/gnomerepo summary -u prev_dir=`pwd` cd ${test_tmpdir} -ostree_repo_init repo --mode=archive-z2 +ostree_repo_init repo --mode=archive ${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false origin $(cat httpd-address)/ostree/gnomerepo ${CMD_PREFIX} ostree --repo=repo pull --mirror origin assert_has_file repo/summary @@ -69,13 +69,13 @@ cd $prev_dir cd ${test_tmpdir} rm -rf repo -ostree_repo_init repo --mode=archive-z2 +ostree_repo_init repo --mode=archive ${OSTREE} --repo=repo remote add origin $(cat httpd-address)/ostree/gnomerepo echo "ok pull mirror without checking signed summary" cd ${test_tmpdir} rm -rf repo -ostree_repo_init repo --mode=archive-z2 +ostree_repo_init repo --mode=archive ${OSTREE} --repo=repo remote add --set=gpg-verify-summary=true origin $(cat httpd-address)/ostree/gnomerepo if ${OSTREE} --repo=repo pull --mirror origin 2>err.txt; then assert_not_reached "Mirroring unexpectedly succeeded" @@ -86,7 +86,7 @@ ${OSTREE} --repo=${test_tmpdir}/ostree-srv/gnomerepo summary -u ${COMMIT_SIGN} cd ${test_tmpdir} rm -rf repo -ostree_repo_init repo --mode=archive-z2 +ostree_repo_init repo --mode=archive ${OSTREE} --repo=repo remote add --set=gpg-verify-summary=true origin $(cat httpd-address)/ostree/gnomerepo ${OSTREE} --repo=repo pull --mirror origin assert_has_file repo/summary @@ -99,7 +99,7 @@ truncate --size=1 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig cd ${test_tmpdir} rm -rf repo mkdir repo -ostree_repo_init repo --mode=archive-z2 +ostree_repo_init repo --mode=archive ${OSTREE} --repo=repo remote add origin $(cat httpd-address)/ostree/gnomerepo ${OSTREE} --repo=repo pull --mirror origin assert_has_file repo/summary |