debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-28 13:44:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/load_config: document expectations for db on error, add tests

Browse source 
This is a bit different than n_d_{open,create}_with_config, since
there are several non-zero status codes where we do want to return a
non-NULL database structure.
This commit is contained in:
David Bremner 2021-10-23 10:22:37 -03:00
parent 2ba50b5230
commit 8f0b84789d
2 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/notmuch.h
View file

@ -460,6 +460,9 @@ notmuch_database_open_with_config (const char *database_path,
* *
* For description of arguments, @see notmuch_database_open_with_config * For description of arguments, @see notmuch_database_open_with_config
* *
* For errors other then NO_DATABASE and NO_CONFIG, *database is set to
* NULL.
*
* @retval NOTMUCH_STATUS_SUCCESS: Successfully loaded configuration. * @retval NOTMUCH_STATUS_SUCCESS: Successfully loaded configuration.
* *
* @retval NOTMUCH_STATUS_NO_CONFIG: No config file was loaded. Not fatal. * @retval NOTMUCH_STATUS_NO_CONFIG: No config file was loaded. Not fatal.

37
test/T590-libconfig.sh
View file

@ -916,4 +916,41 @@ db == NULL: 1
EOF EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "load_config: database set non-null on missing config"
cat c_head3 - c_tail3 <<'EOF' | test_C ${MAIL_DIR} "/nonexistent"
notmuch_status_t st = notmuch_database_load_config(argv[1],argv[2], NULL, &db, NULL);
EOF
cat <<EOF> EXPECTED
== stdout ==
db == NULL: 0
== stderr ==
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "load_config: database non-null on missing config (env)"
old_NOTMUCH_CONFIG=${NOTMUCH_CONFIG}
NOTMUCH_CONFIG="/nonexistent"
cat c_head3 - c_tail3 <<'EOF' | test_C ${MAIL_DIR}
notmuch_status_t st = notmuch_database_load_config(argv[1], NULL, NULL, &db, NULL);
EOF
NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
cat <<EOF> EXPECTED
== stdout ==
db == NULL: 0
== stderr ==
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "load_config: database set to NULL on fatal error"
test_subtest_known_broken
cat c_head3 - c_tail3 <<'EOF' | test_C
notmuch_status_t st = notmuch_database_load_config("relative", NULL, NULL, &db, NULL);
EOF
cat <<EOF> EXPECTED
== stdout ==
db == NULL: 1
== stderr ==
EOF
test_expect_equal_file EXPECTED OUTPUT
test_done test_done