X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2FT055-path-config.sh;h=4897c8142ac73ea47023744cafcfd966985f1a98;hp=71823039f97ef2d100b307e0f3255bf32a557d2e;hb=HEAD;hpb=e221a4531fa8d317560d568634da695952c65365

diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
index 71823039..1feb5624 100755
--- a/test/T055-path-config.sh
+++ b/test/T055-path-config.sh
@@ -92,7 +92,20 @@ xdg_config () {
     notmuch --config=${CONFIG_PATH} config set database.path
 }
 
-for config in traditional split XDG XDG+profile symlink home_mail maildir_env; do
+mailroot_only_config () {
+    local dir
+
+    backup_config
+    notmuch config set database.mail_root ${TMP_DIRECTORY}/mail
+    notmuch config set database.path
+    DATABASE_PATH="${HOME}/.local/share/notmuch/default"
+    rm -rf $DATABASE_PATH
+    mkdir -p $DATABASE_PATH
+    XAPIAN_PATH="${DATABASE_PATH}/xapian"
+    mv mail/.notmuch/xapian $DATABASE_PATH
+}
+
+for config in traditional split XDG XDG+profile symlink home_mail maildir_env mailroot_only; do
     #start each set of tests with an known set of messages
     add_email_corpus
 
@@ -122,6 +135,9 @@ for config in traditional split XDG XDG+profile symlink home_mail maildir_env; d
 	maildir_env)
 	    maildir_env_config
 	    ;;
+	mailroot_only)
+	    mailroot_only_config
+	    ;;
     esac
 
     test_begin_subtest "count ($config)"
@@ -283,6 +299,7 @@ database.backup_dir
 database.hook_dir
 database.mail_root=MAIL_DIR
 database.path
+index.as_text=
 maildir.synchronize_flags=true
 new.ignore=
 new.tags=unread;inbox
@@ -294,7 +311,6 @@ EOF
    test_expect_equal_file EXPECTED OUTPUT
 
    test_begin_subtest "Config list from python ($config)"
-   test_subtest_known_broken
    test_python <<EOF > OUTPUT
 from notmuch2 import Database
 db=Database(config=Database.CONFIG.SEARCH)
@@ -314,6 +330,7 @@ user.other_email
 user.primary_email
 EOF
    test_expect_equal_file EXPECTED OUTPUT
+
    case $config in
        XDG*)
 	   test_begin_subtest "Set shadowed config value in database ($config)"
@@ -339,6 +356,28 @@ to=m.header('To')
 print(to)
 EOF
 	   test_expect_equal_file EXPECTED OUTPUT
+
+	   test_begin_subtest ".notmuch not ignored in split config ($config)"
+	   test_subtest_known_broken
+	   generate_message '[dir]=.notmuch/cur' '[subject]="Do not ignore, very important"'
+	   NOTMUCH_NEW > OUTPUT
+	   notmuch search subject:Do-not-ignore | notmuch_search_sanitize >> OUTPUT
+	   cat <<EOF > EXPECTED
+Added 1 new message to the database.
+thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Do not ignore, very important (inbox unread)
+EOF
+	   test_expect_equal_file EXPECTED OUTPUT
+	   ;&
+       mailroot_only)
+	   test_begin_subtest "create database parent dir ($config)"
+	   rm -r ${DATABASE_PATH}
+	   notmuch new
+	   test_expect_equal "$(xapian-metadata get ${XAPIAN_PATH} version)" 3
+	   ;;
+       home_mail|maildir_env)
+	   test_begin_subtest "No errors from config list ($config)"
+	   notmuch config list 2>OUTPUT 1>/dev/null
+	   test_expect_equal_file /dev/null OUTPUT
 	   ;;
        *)
 	   backup_database
@@ -349,9 +388,6 @@ EOF
 	   ;;
    esac
 
-   case $config in
-       split|XDG*)
-   esac
    restore_config
    rm -rf home/.local
    rm -rf home/.config