X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test%2FT040-setup.sh;h=1223ebf7148cac7196372eada348bf64fa42d671;hb=0d3bef312dd624225825e6fe175ea8830c1c9e39;hp=021f2d0bea7c10de782ffcdd2a5724ba172fc202;hpb=07dff496304d6dc2e8033a18691b095ed9cd212f;p=notmuch

diff --git a/test/T040-setup.sh b/test/T040-setup.sh
index 021f2d0b..1223ebf7 100755
--- a/test/T040-setup.sh
+++ b/test/T040-setup.sh
@@ -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,7 +30,6 @@ 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.retry_lock=something"