X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FT040-setup.sh;h=5eb281d7710efb2783471650602f43a4634dd696;hb=b25e57e6cb65c31030322125aafb0a5eb085b420;hp=b1972e70c3b151e897275d303abc2f7bedfbe56d;hpb=f5db7ad7d243785c274a99734c681e69d13313d0;p=notmuch

diff --git a/test/T040-setup.sh b/test/T040-setup.sh
index b1972e70..5eb281d7 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
+. $(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,7 +19,8 @@ another.suite@example.com
 foo bar
 baz
 EOF
-output=$(notmuch --config=new-notmuch-config config list)
+
+output=$(notmuch --config=new-notmuch-config config list | notmuch_built_with_sanitize)
 test_expect_equal "$output" "\
 database.path=/path/to/maildir
 user.name=Test Suite
@@ -28,6 +29,25 @@ user.other_email=another.suite@example.com;
 new.tags=foo;bar;
 new.ignore=
 search.exclude_tags=baz;
-maildir.synchronize_flags=true"
+maildir.synchronize_flags=true
+built_with.compact=something
+built_with.field_processor=something
+built_with.retry_lock=something"
+
+test_begin_subtest "notmuch with a config but without a database suggests notmuch new"
+notmuch 2>&1 | notmuch_dir_sanitize > OUTPUT
+cat <<EOF > EXPECTED
+Notmuch is configured, but there's not yet a database at
+
+	MAIL_DIR/.notmuch
+
+You probably want to run "notmuch new" now to create that database.
+
+Note that the first run of "notmuch new" can take a very long time
+and that the resulting database will use roughly the same amount of
+storage space as the email being indexed.
+
+EOF
+test_expect_equal_file EXPECTED OUTPUT
 
 test_done