From dd5902cc45bae7582f8a0bc91a0a7f4d8ae45d8c Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Mon, 4 Apr 2016 13:10:28 +0200 Subject: [PATCH] tests: Fix default key test. * tests/openpgp/default-key.test: Avoid using the option '--trust-model' unconditionally. Signed-off-by: Justus Winter --- 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 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