summaryrefslogtreecommitdiff
path: root/tests/test-pull-summary-sigs.sh
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2017-09-01 16:15:33 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2017-09-01 20:54:12 +0000
commit88b25dc65c5e2392a732c157cf43fa3dfac5e191 (patch)
treeed75877fd19b73fe4a1345033aff554917009858 /tests/test-pull-summary-sigs.sh
parentf07432d4cefcea7fb8c602b9ab78e83236127d8f (diff)
downloadostree-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-summary-sigs.sh')
-rwxr-xr-xtests/test-pull-summary-sigs.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test-pull-summary-sigs.sh b/tests/test-pull-summary-sigs.sh
index 016ee4b9..b6b17500 100755
--- a/tests/test-pull-summary-sigs.sh
+++ b/tests/test-pull-summary-sigs.sh
@@ -24,7 +24,7 @@ set -euo pipefail
echo "1..7"
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
@@ -66,7 +66,7 @@ repo_reinit () {
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 --set=gpg-verify-summary=true origin $(cat httpd-address)/ostree/gnomerepo
}