[ostree] tests/remote-gpg-import: Only commit workdir
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] tests/remote-gpg-import: Only commit workdir
- Date: Tue, 2 Jun 2015 16:39:37 +0000 (UTC)
commit 4f785d4f86208b4db92933579df4ddec39aeaf48
Author: Colin Walters <walters verbum org>
Date: Tue Jun 2 12:38:26 2015 -0400
tests/remote-gpg-import: Only commit workdir
Just noticed this while debugging something else. We don't want to
commit the whole test dir, just the workdir.
Trying to commit the repo itself is potentially subject to race
conditions at least.
tests/test-remote-gpg-import.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/tests/test-remote-gpg-import.sh b/tests/test-remote-gpg-import.sh
index fda6bea..8281eeb 100755
--- a/tests/test-remote-gpg-import.sh
+++ b/tests/test-remote-gpg-import.sh
@@ -110,7 +110,7 @@ ${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo checkout main workdir
# Sign a new commit with key1 and try pulling from each remote
echo shadow > workdir/blinky
-${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo commit -b main -s "Add blinky" --gpg-sign
${TEST_GPG_KEYID_1} --gpg-homedir ${SRCDIR}/gpghome
+${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo commit -b main -s "Add blinky" --gpg-sign
${TEST_GPG_KEYID_1} --gpg-homedir ${SRCDIR}/gpghome workdir
if ${OSTREE} pull R2:main >/dev/null 2>&1; then
assert_not_reached "(key1/R2) GPG verification unexpectedly succeeded"
fi
@@ -121,7 +121,7 @@ ${OSTREE} pull R1:main >/dev/null
# Sign a new commit with key2 and try pulling from each remote
echo speedy > workdir/pinky
-${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo commit -b main -s "Add pinky" --gpg-sign
${TEST_GPG_KEYID_2} --gpg-homedir ${SRCDIR}/gpghome
+${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo commit -b main -s "Add pinky" --gpg-sign
${TEST_GPG_KEYID_2} --gpg-homedir ${SRCDIR}/gpghome workdir
if ${OSTREE} pull R1:main >/dev/null 2>&1; then
assert_not_reached "(key2/R1) GPG verification unexpectedly succeeded"
fi
@@ -132,7 +132,7 @@ ${OSTREE} pull R2:main >/dev/null
# Sign a new commit with key3 and try pulling from each remote
echo bashful > workdir/inky
-${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo commit -b main -s "Add inky" --gpg-sign ${TEST_GPG_KEYID_3}
--gpg-homedir ${SRCDIR}/gpghome
+${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo commit -b main -s "Add inky" --gpg-sign ${TEST_GPG_KEYID_3}
--gpg-homedir ${SRCDIR}/gpghome workdir
if ${OSTREE} pull R1:main >/dev/null 2>&1; then
assert_not_reached "(key3/R1) GPG verification unexpectedly succeeded"
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]