diff options
| author | David Bremner <david@tethera.net> | 2021-10-23 10:22:37 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-10-30 13:49:37 -0300 |
| commit | 8f0b84789d4fda0182e073b68b73160c9b94a4b7 (patch) | |
| tree | 30d3a2f9f0ecf651a516064493c1349855949f75 | |
| parent | 2ba50b52302dce08068843e0029f9ee935a0d7f3 (diff) | |
lib/load_config: document expectations for db on error, add tests
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.
| -rw-r--r-- | lib/notmuch.h | 3 | ||||
| -rwxr-xr-x | test/T590-libconfig.sh | 37 |
2 files changed, 40 insertions, 0 deletions
diff --git a/lib/notmuch.h b/lib/notmuch.h index 316385b8..5c5a024e 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -460,6 +460,9 @@ notmuch_database_open_with_config (const char *database_path, * * 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_NO_CONFIG: No config file was loaded. Not fatal. diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index bed887aa..b4abbd78 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -916,4 +916,41 @@ db == NULL: 1 EOF 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 |