X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FT030-config.sh;h=6610bf8e874ed9e93472159bc82b105be33bfca0;hb=e823d05ae6dc920d4fc9abf774c3d2575d891d7b;hp=eba2e0e76aa73a6784e055e9bcb55af8720116a0;hpb=a1e649276e181bbb2f14594628333d4337e3fc7c;p=notmuch

diff --git a/test/T030-config.sh b/test/T030-config.sh
index eba2e0e7..6610bf8e 100755
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -46,11 +46,6 @@ test_begin_subtest "List all items"
 notmuch config list > STDOUT 2> STDERR
 printf "%s\n====\n%s\n" "$(< STDOUT)" "$(< STDERR)" | notmuch_config_sanitize > OUTPUT
 
-if [ "${NOTMUCH_GMIME_MAJOR}" -lt 3 ]; then
-    config_gpg_path="crypto.gpg_path=gpg
-"
-fi
-
 cat <<EOF > EXPECTED
 database.path=MAIL_DIR
 user.name=Notmuch Test Suite
@@ -60,13 +55,13 @@ new.tags=unread;inbox;
 new.ignore=
 search.exclude_tags=
 maildir.synchronize_flags=true
-${config_gpg_path}foo.string=this is another string value
+foo.string=this is another string value
 foo.list=this;is another;list value;
 built_with.compact=something
 built_with.field_processor=something
 built_with.retry_lock=something
 ====
-Error opening database at MAIL_DIR/.notmuch: No such file or directory
+Error: Cannot open database at MAIL_DIR/.notmuch: No such file or directory.
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
@@ -81,7 +76,7 @@ test_expect_equal "$(notmuch --config:alt-config config get user.name)" \
     "Another Name"
 
 test_begin_subtest "Top level --config<space>FILE option"
-test_expect_equal "$(notmuch --config  alt-config config get user.name)" \
+test_expect_equal "$(notmuch --config alt-config config get user.name)" \
     "Another Name"
 
 test_begin_subtest "Top level --config=FILE option changed the right file"