diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-07-14 15:12:00 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-07-14 21:23:52 -0300 |
| commit | e142de643d3bb4354f70e1490a97b491d1116e95 (patch) | |
| tree | cb192df604b692bc415584c2c66e993efa6a7864 /test | |
| parent | 8492298a613e8e666d0f3054dadcb98b72a65ae4 (diff) | |
config: deprecate/drop crypto.gpg_path under gmime 2.6/3.0
gmime 3.0 no longer offers a means to set the path for gpg.
Users can set $PATH anyway if they want to pick a
differently-installed gpg (e.g. /usr/local/bin/gpg), so this isn't
much of a reduction in functionality.
The one main difference is for people who have tried to use "gpg2" to
make use of gpg 2.1, but that isn't usefully co-installable anyway.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/T030-config.sh | 9 | ||||
| -rwxr-xr-x | test/T040-setup.sh | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/test/T030-config.sh b/test/T030-config.sh index 79a24948..35d757f6 100755 --- a/test/T030-config.sh +++ b/test/T030-config.sh @@ -44,6 +44,12 @@ test_expect_equal "$(notmuch config get foo.nonexistent)" "" test_begin_subtest "List all items" notmuch config list 2>&1 | notmuch_config_sanitize > OUTPUT + +if [ "${NOTMUCH_GMIME_MAJOR}" -lt 3 ]; then + config_gpg_path="crypto.gpg_path=gpg +" +fi + cat <<EOF > EXPECTED Error opening database at MAIL_DIR/.notmuch: No such file or directory database.path=MAIL_DIR @@ -54,8 +60,7 @@ new.tags=unread;inbox; new.ignore= search.exclude_tags= maildir.synchronize_flags=true -crypto.gpg_path=gpg -foo.string=this is another string value +${config_gpg_path}foo.string=this is another string value foo.list=this;is another;list value; built_with.compact=something built_with.field_processor=something diff --git a/test/T040-setup.sh b/test/T040-setup.sh index 021f2d0b..998bd6e0 100755 --- a/test/T040-setup.sh +++ b/test/T040-setup.sh @@ -19,6 +19,12 @@ another.suite@example.com foo bar baz EOF + +if [ "${NOTMUCH_GMIME_MAJOR}" -lt 3 ]; then + config_gpg_path="crypto.gpg_path=gpg +" +fi + output=$(notmuch --config=new-notmuch-config config list | notmuch_built_with_sanitize) test_expect_equal "$output" "\ database.path=/path/to/maildir @@ -29,7 +35,7 @@ new.tags=foo;bar; new.ignore= search.exclude_tags=baz; maildir.synchronize_flags=true -crypto.gpg_path=gpg +""${config_gpg_path}""\ built_with.compact=something built_with.field_processor=something built_with.retry_lock=something" |