packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Colin Walters 2015-06-02 12:38:26 -04:00
parent 92deafec46
commit 4f785d4f86
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test-remote-gpg-import.sh
View File

@ -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 # Sign a new commit with key1 and try pulling from each remote
echo shadow > workdir/blinky 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 if ${OSTREE} pull R2:main >/dev/null 2>&1; then
assert_not_reached "(key1/R2) GPG verification unexpectedly succeeded" assert_not_reached "(key1/R2) GPG verification unexpectedly succeeded"
fi fi
@ -121,7 +121,7 @@ ${OSTREE} pull R1:main >/dev/null
# Sign a new commit with key2 and try pulling from each remote # Sign a new commit with key2 and try pulling from each remote
echo speedy > workdir/pinky 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 if ${OSTREE} pull R1:main >/dev/null 2>&1; then
assert_not_reached "(key2/R1) GPG verification unexpectedly succeeded" assert_not_reached "(key2/R1) GPG verification unexpectedly succeeded"
fi fi
@ -132,7 +132,7 @@ ${OSTREE} pull R2:main >/dev/null
# Sign a new commit with key3 and try pulling from each remote # Sign a new commit with key3 and try pulling from each remote
echo bashful > workdir/inky 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 if ${OSTREE} pull R1:main >/dev/null 2>&1; then
assert_not_reached "(key3/R1) GPG verification unexpectedly succeeded" assert_not_reached "(key3/R1) GPG verification unexpectedly succeeded"
fi fi