security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

tests/openpgp: Make tests more portable.

Browse Source 
* tests/openpgp/default-key.test: Avoid 'grep -q'.
* tests/openpgp/gpgtar.test: Avoid 'grep -qe' and 'diff -q'.
* tests/openpgp/use-exact-key.test: Avoid 'grep -q'.

GnuPG-bug-id: 2262
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Uldis Anšmits 2016-03-02 17:55:56 +01:00 committed by Justus Winter
parent 50995d2608
commit 1cdb744d91
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/openpgp/default-key.test
View File

@ -35,7 +35,7 @@ do
info "Trying --default-key $x" info "Trying --default-key $x"
if ! echo | $GPG --default-key "$x" -s | $GPG --verify --status-fd=1 \ if ! echo | $GPG --default-key "$x" -s | $GPG --verify --status-fd=1 \
| grep -q 'VALIDSIG 5FBA84ACE02DCB17DA3DFF6BBCA43C441EA97479' | grep 'VALIDSIG 5FBA84ACE02DCB17DA3DFF6BBCA43C441EA97479' >/dev/null
then then
echo | $GPG --default-key "$x" -s | $GPG --verify --status-fd=2 echo | $GPG --default-key "$x" -s | $GPG --verify --status-fd=2
error "Unexpected key used for signing (not the signing subkey, specified \"$x\")." error "Unexpected key used for signing (not the signing subkey, specified \"$x\")."
@ -59,7 +59,7 @@ do
--default-key "$x" --encrypt-to-default-key \ --default-key "$x" --encrypt-to-default-key \
-r 439F02CA -e \ -r 439F02CA -e \
| $GPG --list-packets \ | $GPG --list-packets \
| grep -q "keyid[ ][A-F0-9]*45117079" | grep "keyid[ ][A-F0-9]*45117079" >/dev/null
then then
echo | $GPG --trust-model=always \ echo | $GPG --trust-model=always \
--default-key "$x" --encrypt-to-default-key \ --default-key "$x" --encrypt-to-default-key \

4
tests/openpgp/gpgtar.test
View File

@ -59,7 +59,7 @@ do_test()
>"$FILELIST" >"$FILELIST"
for F in $TESTFILES for F in $TESTFILES
do do
grep -qe "\\b${F}\\b" "$FILELIST" awk '{print $NF}' "$FILELIST" | grep "^${F}$" >/dev/null
done done
$TOOL --gpg "$GPG" --gpg-args "$GPGARGS" $EXTRACT_FLAGS \ $TOOL --gpg "$GPG" --gpg-args "$GPGARGS" $EXTRACT_FLAGS \
@ -67,7 +67,7 @@ do_test()
"${TESTDIR}/test.tar.pgp" "${TESTDIR}/test.tar.pgp"
for F in $TESTFILES for F in $TESTFILES
do do
diff -q "$F" "${TESTDIR}/$F" cmp "$F" "${TESTDIR}/$F"
done done
) )
} }

4
tests/openpgp/use-exact-key.test
View File

@ -32,7 +32,7 @@ fi
for x in 8BC90111 3E880CFF F5F77B83 45117079 1EA97479 for x in 8BC90111 3E880CFF F5F77B83 45117079 1EA97479
do do
if ! echo | $GPG -s -u "$x" | $GPG --verify --status-fd=1 \ if ! echo | $GPG -s -u "$x" | $GPG --verify --status-fd=1 \
| grep -q 'VALIDSIG 5FBA84ACE02DCB17DA3DFF6BBCA43C441EA97479' | grep 'VALIDSIG 5FBA84ACE02DCB17DA3DFF6BBCA43C441EA97479' >/dev/null
then then
echo | $GPG -s -u "$x" | $GPG --verify --status-fd=2 echo | $GPG -s -u "$x" | $GPG --verify --status-fd=2
error "Unexpected key used for signing (not the signing subkey, specified \"$x\")." error "Unexpected key used for signing (not the signing subkey, specified \"$x\")."
@ -44,7 +44,7 @@ done
for x in 8BC90111 F5F77B83 1EA97479 for x in 8BC90111 F5F77B83 1EA97479
do do
if ! echo | $GPG -s -u "$x!" | $GPG --verify --status-fd=1 \ if ! echo | $GPG -s -u "$x!" | $GPG --verify --status-fd=1 \
| grep -q "VALIDSIG [0-9A-F]*$x " | grep "VALIDSIG [0-9A-F]*$x " >/dev/null
then then
echo | $GPG -s -u "$x!" | $GPG --verify --status-fd=2 echo | $GPG -s -u "$x!" | $GPG --verify --status-fd=2
error "Unexpected key used for signing (specified: \"$x!\")." error "Unexpected key used for signing (specified: \"$x!\")."