Merge tag 'debian/0.32.3-1'

[notmuch] / test / T590-libconfig.sh

diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
index bc7298f842f5e1bce7f07d7a7e56bfd4c6a768c8..41f67baeceb02719802439cc9e0936e2f264f6dd 100755 (executable)
--- a/test/T590-libconfig.sh
+++ b/test/T590-libconfig.sh
@@ -419,6 +419,7 @@ cat <<'EOF' >EXPECTED
 08: 'USERNAME@FQDN'
 09: 'NULL'
 10: 'USER_FULL_NAME'
+11: '8000'
 == stderr ==
 EOF
 unset MAILDIR
@@ -713,23 +714,24 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
         key < NOTMUCH_CONFIG_LAST;
         key = (notmuch_config_key_t)(key + 1)) {
        const char *val = notmuch_config_get (db, key);
-       printf("%x: '%s'\n", key, val ? val : "NULL" );
+       printf("%02d: '%s'\n", key, val ? val : "NULL" );
     }
 }
 EOF
 cat <<'EOF' >EXPECTED
 == stdout ==
-0: 'MAIL_DIR'
-1: 'MAIL_DIR'
-2: 'MAIL_DIR/.notmuch/hooks'
-3: 'MAIL_DIR/.notmuch/backups'
-4: 'foo;bar;fub'
-5: 'unread;inbox'
-6: 'sekrit_junk'
-7: 'true'
-8: 'test_suite@notmuchmail.org'
-9: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org'
-a: 'Notmuch Test Suite'
+00: 'MAIL_DIR'
+01: 'MAIL_DIR'
+02: 'MAIL_DIR/.notmuch/hooks'
+03: 'MAIL_DIR/.notmuch/backups'
+04: 'foo;bar;fub'
+05: 'unread;inbox'
+06: 'sekrit_junk'
+07: 'true'
+08: 'test_suite@notmuchmail.org'
+09: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org'
+10: 'Notmuch Test Suite'
+11: '8000'
 == stderr ==
 EOF
 test_expect_equal_file EXPECTED OUTPUT
@@ -762,6 +764,7 @@ cat <<'EOF' >EXPECTED
 08: 'USERNAME@FQDN'
 09: 'NULL'
 10: 'USER_FULL_NAME'
+11: '8000'
 == stderr ==
 EOF
 test_expect_equal_file EXPECTED OUTPUT.clean
@@ -828,6 +831,7 @@ EOF
 cat <<'EOF' >EXPECTED
 == stdout ==
 aaabefore beforeval
+database.autocommit 8000
 database.backup_dir MAIL_DIR/.notmuch/backups
 database.hook_dir MAIL_DIR/.notmuch/hooks
 database.mail_root MAIL_DIR