X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test%2FT055-path-config.sh;h=63dd90fdc1179adf57ced6c38951b47e6a19430c;hb=4612f3eb3dbf16bf98ccbadef77d7a6f6361e692;hp=27dd209af63dac4b2d92edb46560e9f8d7dfadc3;hpb=4f84c01b3ab2002812293a0951c4f69acb9ddea2;p=notmuch

diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
index 27dd209a..63dd90fd 100755
--- a/test/T055-path-config.sh
+++ b/test/T055-path-config.sh
@@ -266,7 +266,7 @@ EOF
    test_expect_equal "${output}+${output2}" "${value}+"
 
    test_begin_subtest "Config list ($config)"
-   notmuch config list | notmuch_dir_sanitize | \
+   notmuch config list | notmuch_config_sanitize | \
        sed -e "s/^database.backup_dir=.*$/database.backup_dir/"  \
 	   -e "s/^database.hook_dir=.*$/database.hook_dir/" \
 	   -e "s/^database.path=.*$/database.path/"  \
@@ -274,9 +274,10 @@ EOF
 	   -e "s,^database.mail_root=CWD/home/env_points_here,database.mail_root=MAIL_DIR," \
 	   > OUTPUT
    cat <<EOF > EXPECTED
-built_with.compact=true
-built_with.field_processor=true
-built_with.retry_lock=true
+built_with.compact=something
+built_with.field_processor=something
+built_with.retry_lock=something
+built_with.sexp_queries=something
 database.autocommit=8000
 database.backup_dir
 database.hook_dir
@@ -292,6 +293,26 @@ user.primary_email=test_suite@notmuchmail.org
 EOF
    test_expect_equal_file EXPECTED OUTPUT
 
+   test_begin_subtest "Config list from python ($config)"
+   test_python <<EOF > OUTPUT
+from notmuch2 import Database
+db=Database(config=Database.CONFIG.SEARCH)
+for key in list(db.config):
+    print(key)
+EOF
+   cat <<EOF > EXPECTED
+database.autocommit
+database.backup_dir
+database.hook_dir
+database.mail_root
+database.path
+maildir.synchronize_flags
+new.tags
+user.name
+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)"
@@ -305,8 +326,42 @@ EOF
 	   output2=$(notmuch --config='' config get ${key})
 	   notmuch config set ${key}
 	   test_expect_equal "${output}+${output2}" "${value}+"
+	   ;&
+       split)
+	   test_begin_subtest "'to' header does not crash (python-cffi) ($config)"
+	   echo 'notmuch@notmuchmail.org' > EXPECTED
+	   test_python <<EOF
+from notmuch2 import Database
+db=Database(config=Database.CONFIG.SEARCH)
+m=db.find('20091117232137.GA7669@griffis1.net')
+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
+	   ;;
+       *)
+	   backup_database
+	   test_begin_subtest ".notmuch without xapian/ handled gracefully ($config)"
+	   rm -r $XAPIAN_PATH
+	   test_expect_success "notmuch new"
+	   restore_database
 	   ;;
    esac
+
+   case $config in
+       split|XDG*)
+   esac
    restore_config
    rm -rf home/.local
    rm -rf home/.config