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: Fix default key test.

Browse Source 
* tests/openpgp/default-key.test: Avoid using the option
'--trust-model' unconditionally.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-04-04 13:10:28 +02:00
parent 42d4c2762f
commit dd5902cc45
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,13 +55,13 @@ do
# #
# Note: it doesn't matter whether we specify the primary key or # Note: it doesn't matter whether we specify the primary key or
# a subkey: the newest encryption subkey will be used. # a subkey: the newest encryption subkey will be used.
if ! echo | $GPG --trust-model=always \ if ! echo | $GPG ${opt_always} \
--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 "keyid[ ][A-F0-9]*45117079" >/dev/null | grep "keyid[ ][A-F0-9]*45117079" >/dev/null
then then
echo | $GPG --trust-model=always \ echo | $GPG ${opt_always} \
--default-key "$x" --encrypt-to-default-key \ --default-key "$x" --encrypt-to-default-key \
-r 439F02CA -e \ -r 439F02CA -e \
| $GPG --list-packets 1>&2 | $GPG --list-packets 1>&2