aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2016-04-04 11:10:28 +0000
committerJustus Winter <[email protected]>2016-04-04 11:10:28 +0000
commitdd5902cc45bae7582f8a0bc91a0a7f4d8ae45d8c (patch)
treeaf4366ecb1f6c6017a75592cb2f850b41bacf3e3
parentpo: Fix misleading german translation. (diff)
downloadgnupg-dd5902cc45bae7582f8a0bc91a0a7f4d8ae45d8c.tar.gz
gnupg-dd5902cc45bae7582f8a0bc91a0a7f4d8ae45d8c.zip
tests: Fix default key test.
* tests/openpgp/default-key.test: Avoid using the option '--trust-model' unconditionally. Signed-off-by: Justus Winter <[email protected]>
-rwxr-xr-xtests/openpgp/default-key.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/openpgp/default-key.test b/tests/openpgp/default-key.test
index 567f38d82..83e4f7991 100755
--- a/tests/openpgp/default-key.test
+++ b/tests/openpgp/default-key.test
@@ -55,13 +55,13 @@ do
#
# Note: it doesn't matter whether we specify the primary key or
# 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 \
-r 439F02CA -e \
| $GPG --list-packets \
| grep "keyid[ ][A-F0-9]*45117079" >/dev/null
then
- echo | $GPG --trust-model=always \
+ echo | $GPG ${opt_always} \
--default-key "$x" --encrypt-to-default-key \
-r 439F02CA -e \
| $GPG --list-packets 1>&2