[Pkg-gnupg-commit] [gnupg2] 114/205: tests: Fix default key test.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit dd5902cc45bae7582f8a0bc91a0a7f4d8ae45d8c
Author: Justus Winter <justus at g10code.com>
Date:   Mon Apr 4 13:10:28 2016 +0200

    tests: Fix default key test.
    
    * tests/openpgp/default-key.test: Avoid using the option
    '--trust-model' unconditionally.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 tests/openpgp/default-key.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/openpgp/default-key.test b/tests/openpgp/default-key.test
index 567f38d..83e4f79 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git