tests: Fix default key test.
authorJustus Winter <justus@g10code.com>
Mon, 4 Apr 2016 11:10:28 +0000 (13:10 +0200)
committerJustus Winter <justus@g10code.com>
Mon, 4 Apr 2016 11:10:28 +0000 (13:10 +0200)
* tests/openpgp/default-key.test: Avoid using the option
'--trust-model' unconditionally.

Signed-off-by: Justus Winter <justus@g10code.com>
tests/openpgp/default-key.test

index 567f38d..83e4f79 100755 (executable)
@@ -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