shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

libtest: add has_gpgme() helper function

Browse Source 
Closes: #469
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2016-08-25 12:14:21 -04:00 committed by Atomic Bot
parent 157d878ce1
commit c4c030cc79
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/libtest.sh
View File

@ -420,6 +420,10 @@ skip_without_fuse () {
[ -e /etc/mtab ] || skip "no /etc/mtab"
}
has_gpgme () {
${CMD_PREFIX} ostree --version | grep -q -e '\+gpgme'
}
libtest_cleanup_gpg () {
gpg-connect-agent --homedir ${test_tmpdir}/gpghome killagent /bye || true
}

6
tests/test-commit-sign.sh
View File

@ -19,13 +19,13 @@
set -euo pipefail
if ! ostree --version | grep -q -e '\+gpgme'; then
. $(dirname $0)/libtest.sh
if ! has_gpgme; then
echo "1..0 #SKIP no gpg support compiled in"
exit 0
fi
. $(dirname $0)/libtest.sh
echo "1..1"
keyid="472CDAFA"

6
tests/test-gpg-signed-commit.sh
View File

@ -20,13 +20,13 @@
set -euo pipefail
if ! ostree --version | grep -q -e '\+gpgme'; then
. $(dirname $0)/libtest.sh
if ! has_gpgme; then
echo "1..0 #SKIP no gpgme support compiled in"
exit 0
fi
. $(dirname $0)/libtest.sh
echo "1..1"
setup_test_repository "archive-z2"

2
tests/test-pull-mirror-summary.sh
View File

@ -61,7 +61,7 @@ find repo/objects -name '*.filez' | while read name; do
done
echo "ok pull mirror summary"
if ! ${CMD_PREFIX} ostree --version | grep -q -e '\+gpgme'; then
if ! has_gpgme; then
exit 0;
fi

2
tests/test-pull-summary-sigs.sh
View File

@ -54,7 +54,7 @@ assert_file_has_content yet-another-copy/yet-another-hello-world "hello world ye
${CMD_PREFIX} ostree --repo=repo fsck
echo "ok pull mirror summary"
if ! ${CMD_PREFIX} ostree --version | grep -q -e '\+gpgme'; then
if ! has_gpgme; then
exit 0;
fi