]> git.notmuchmail.org Git - notmuch/blobdiff - test/T040-setup.sh
Merge tag '0.31.4'
[notmuch] / test / T040-setup.sh
index be2f0dbd967f6dc091db34a56c50cbf8435fd953..1223ebf7148cac7196372eada348bf64fa42d671 100755 (executable)
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
 test_description='"notmuch setup"'
-. ./test-lib.sh || exit 1
+. $(dirname "$0")/test-lib.sh || exit 1
 
 test_begin_subtest "Notmuch new without a config suggests notmuch setup"
 output=$(notmuch --config=new-notmuch-config new 2>&1)
 test_expect_equal "$output" "\
-Configuration file new-notmuch-config not found.
+Error: cannot load config file.
 Try running 'notmuch setup' to create a configuration."
 
 test_begin_subtest "Create a new config interactively"
@@ -19,6 +19,7 @@ another.suite@example.com
 foo bar
 baz
 EOF
+
 output=$(notmuch --config=new-notmuch-config config list | notmuch_built_with_sanitize)
 test_expect_equal "$output" "\
 database.path=/path/to/maildir
@@ -29,8 +30,8 @@ new.tags=foo;bar;
 new.ignore=
 search.exclude_tags=baz;
 maildir.synchronize_flags=true
-crypto.gpg_path=gpg
 built_with.compact=something
-built_with.field_processor=something"
+built_with.field_processor=something
+built_with.retry_lock=something"
 
 test_done