Merge tag 'debian/0.34.2-1'

[notmuch] / test / T055-path-config.sh

diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
index 27dd209af63dac4b2d92edb46560e9f8d7dfadc3..f0ce55dac93a494d51ab3eab9cb1c9bbcdb9c9a7 100755 (executable)
--- 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
@@ -305,7 +306,23 @@ 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
+          ;& # fall through
+   esac
+
+   case $config in
+       split|XDG*)
    esac
    restore_config
    rm -rf home/.local