diff options
author | Dan Nicholson <nicholson@endlessm.com> | 2015-06-03 12:54:36 -0700 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2015-06-04 20:58:14 -0400 |
commit | e228e0f142a8de24c3763e75fe0304a72d4bb280 (patch) | |
tree | e883361364f5bb80e50ad48c72052bace13bdf77 /tests/test-remote-gpg-import.sh | |
parent | 2e0521804d26f0804f86fbba9d06884b82720cc8 (diff) | |
download | ostree-e228e0f142a8de24c3763e75fe0304a72d4bb280.tar.gz |
tests: Use temporary gpg homedir
libtest always makes a copy of the gpghome directory to the test
directory, so there's no need to operate on the installed copy. This
allows test-remote-gpg-import to pass as an unprivileged user since it
otherwise couldn't create the temp files gpgme creates.
Diffstat (limited to 'tests/test-remote-gpg-import.sh')
-rwxr-xr-x | tests/test-remote-gpg-import.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/test-remote-gpg-import.sh b/tests/test-remote-gpg-import.sh index 8281eebc..0dc5424e 100755 --- a/tests/test-remote-gpg-import.sh +++ b/tests/test-remote-gpg-import.sh @@ -41,7 +41,7 @@ ${OSTREE} remote add R1 $(cat httpd-address)/ostree/gnomerepo assert_not_has_file repo/R1.trustedkeys.gpg # Import one valid key ID -${OSTREE} remote gpg-import --keyring ${SRCDIR}/gpghome/trusted/pubring.gpg R1 ${TEST_GPG_KEYID_1} | grep -o 'Imported [[:digit:]] GPG key' > result +${OSTREE} remote gpg-import --keyring ${test_tmpdir}/gpghome/trusted/pubring.gpg R1 ${TEST_GPG_KEYID_1} | grep -o 'Imported [[:digit:]] GPG key' > result assert_file_has_content result 'Imported 1 GPG key' assert_has_file repo/R1.trustedkeys.gpg @@ -57,15 +57,15 @@ assert_not_has_file repo/R1.trustedkeys.gpg ${OSTREE} remote add R1 $(cat httpd-address)/ostree/gnomerepo # Import one valid key ID -${OSTREE} remote gpg-import --keyring ${SRCDIR}/gpghome/trusted/pubring.gpg R1 ${TEST_GPG_KEYID_1} | grep -o 'Imported [[:digit:]] GPG key' > result +${OSTREE} remote gpg-import --keyring ${test_tmpdir}/gpghome/trusted/pubring.gpg R1 ${TEST_GPG_KEYID_1} | grep -o 'Imported [[:digit:]] GPG key' > result assert_file_has_content result 'Imported 1 GPG key' # Import multiple valid key IDs -${OSTREE} remote gpg-import --keyring ${SRCDIR}/gpghome/trusted/pubring.gpg R1 ${TEST_GPG_KEYID_2} ${TEST_GPG_KEYID_3} | grep -o 'Imported [[:digit:]] GPG key' > result +${OSTREE} remote gpg-import --keyring ${test_tmpdir}/gpghome/trusted/pubring.gpg R1 ${TEST_GPG_KEYID_2} ${TEST_GPG_KEYID_3} | grep -o 'Imported [[:digit:]] GPG key' > result assert_file_has_content result 'Imported 2 GPG key' # Import key IDs we already have, make sure they're caught -${OSTREE} remote gpg-import --keyring ${SRCDIR}/gpghome/trusted/pubring.gpg R1 ${TEST_GPG_KEYID_1} ${TEST_GPG_KEYID_3} | grep -o 'Imported [[:digit:]] GPG key' > result +${OSTREE} remote gpg-import --keyring ${test_tmpdir}/gpghome/trusted/pubring.gpg R1 ${TEST_GPG_KEYID_1} ${TEST_GPG_KEYID_3} | grep -o 'Imported [[:digit:]] GPG key' > result assert_file_has_content result 'Imported 0 GPG key' ${OSTREE} remote delete R1 @@ -73,7 +73,7 @@ ${OSTREE} remote delete R1 ${OSTREE} remote add R1 $(cat httpd-address)/ostree/gnomerepo # Import all keys from keyring -${OSTREE} remote gpg-import --keyring ${SRCDIR}/gpghome/trusted/pubring.gpg R1 | grep -o 'Imported [[:digit:]] GPG key' > result +${OSTREE} remote gpg-import --keyring ${test_tmpdir}/gpghome/trusted/pubring.gpg R1 | grep -o 'Imported [[:digit:]] GPG key' > result assert_file_has_content result 'Imported 3 GPG key' ${OSTREE} remote delete R1 @@ -85,7 +85,7 @@ ${OSTREE} remote delete R1 ${OSTREE} remote add R1 $(cat httpd-address)/ostree/gnomerepo # Import ASCII-armored keys thru stdin -cat ${SRCDIR}/gpghome/key{1,2,3}.asc | ${OSTREE} remote gpg-import --stdin R1 | grep -o 'Imported [[:digit:]] GPG key' > result +cat ${test_tmpdir}/gpghome/key{1,2,3}.asc | ${OSTREE} remote gpg-import --stdin R1 | grep -o 'Imported [[:digit:]] GPG key' > result assert_file_has_content result 'Imported 3 GPG key' ${OSTREE} remote delete R1 @@ -96,13 +96,13 @@ ${OSTREE} remote delete R1 # This also tests "remote add" with --gpg-import. #------------------------------------------------------------ -${OSTREE} remote add --gpg-import ${SRCDIR}/gpghome/key1.asc R1 $(cat httpd-address)/ostree/gnomerepo | grep -o 'Imported [[:digit:]] GPG key' > result +${OSTREE} remote add --gpg-import ${test_tmpdir}/gpghome/key1.asc R1 $(cat httpd-address)/ostree/gnomerepo | grep -o 'Imported [[:digit:]] GPG key' > result assert_file_has_content result 'Imported 1 GPG key' -${OSTREE} remote add --gpg-import ${SRCDIR}/gpghome/key2.asc R2 $(cat httpd-address)/ostree/gnomerepo | grep -o 'Imported [[:digit:]] GPG key' > result +${OSTREE} remote add --gpg-import ${test_tmpdir}/gpghome/key2.asc R2 $(cat httpd-address)/ostree/gnomerepo | grep -o 'Imported [[:digit:]] GPG key' > result assert_file_has_content result 'Imported 1 GPG key' -${OSTREE} remote add --gpg-import ${SRCDIR}/gpghome/key3.asc R3 $(cat httpd-address)/ostree/gnomerepo | grep -o 'Imported [[:digit:]] GPG key' > result +${OSTREE} remote add --gpg-import ${test_tmpdir}/gpghome/key3.asc R3 $(cat httpd-address)/ostree/gnomerepo | grep -o 'Imported [[:digit:]] GPG key' > result assert_file_has_content result 'Imported 1 GPG key' # Checkout the "remote" repo so we can add more commits @@ -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 workdir +${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo commit -b main -s "Add blinky" --gpg-sign ${TEST_GPG_KEYID_1} --gpg-homedir ${test_tmpdir}/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 workdir +${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo commit -b main -s "Add pinky" --gpg-sign ${TEST_GPG_KEYID_2} --gpg-homedir ${test_tmpdir}/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 workdir +${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo commit -b main -s "Add inky" --gpg-sign ${TEST_GPG_KEYID_3} --gpg-homedir ${test_tmpdir}/gpghome workdir if ${OSTREE} pull R1:main >/dev/null 2>&1; then assert_not_reached "(key3/R1) GPG verification unexpectedly succeeded" fi |