diff options
| author | David Bremner <david@tethera.net> | 2021-02-14 07:54:22 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-03-27 09:26:14 -0300 |
| commit | 3787fe6c84ae223ba8c34920c3a2495c71abfe6c (patch) | |
| tree | 7e8b6c3d79c7d1151c6cead0b1b084b0ffe72112 /test/T030-config.sh | |
| parent | 34f734e26b1202cbfbbd06293962571538188fc4 (diff) | |
CLI/config: switch "notmuch config list" to merged config
Use the database opened at the top level rather than opening another
notmuch_database_t.
Test output changes because keys are now listed in alphabetical order,
and because a missing database is no longer an error.
Diffstat (limited to 'test/T030-config.sh')
| -rwxr-xr-x | test/T030-config.sh | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/test/T030-config.sh b/test/T030-config.sh index ba29cbac..ffbd7681 100755 --- a/test/T030-config.sh +++ b/test/T030-config.sh @@ -46,25 +46,22 @@ notmuch config set foo.nonexistent test_expect_equal "$(notmuch config get foo.nonexistent)" "" test_begin_subtest "List all items" -notmuch config list > STDOUT 2> STDERR -printf "%s\n====\n%s\n" "$(< STDOUT)" "$(< STDERR)" | notmuch_config_sanitize > OUTPUT - +notmuch config list 2>&1 | notmuch_config_sanitize > OUTPUT cat <<EOF > EXPECTED -database.path=MAIL_DIR -user.name=Notmuch Test Suite -user.primary_email=test_suite@notmuchmail.org -user.other_email=test_suite_other@notmuchmail.org;test_suite@otherdomain.org -new.tags=unread;inbox; -new.ignore= -search.exclude_tags= -maildir.synchronize_flags=true -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: Cannot open database at MAIL_DIR/.notmuch: No such file or directory. +database.mail_root=MAIL_DIR +database.path=MAIL_DIR +foo.list=this;is another;list value; +foo.string=this is another string value +maildir.synchronize_flags=true +new.ignore= +new.tags=unread;inbox; +search.exclude_tags= +user.name=Notmuch Test Suite +user.other_email=test_suite_other@notmuchmail.org;test_suite@otherdomain.org +user.primary_email=test_suite@notmuchmail.org EOF test_expect_equal_file EXPECTED OUTPUT |