test/libconfig: use 'export' for remaining sets of NOTMUCH_CONFIG

It makes the tests easier to understand if we always use export for
environment variables.
This commit is contained in:
David Bremner 2021-12-03 20:47:05 -04:00
parent 48b5263646
commit 59a778ae4b

View file

@ -876,13 +876,13 @@ test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "open: database set to null on missing config (env)" test_begin_subtest "open: database set to null on missing config (env)"
old_NOTMUCH_CONFIG=${NOTMUCH_CONFIG} old_NOTMUCH_CONFIG=${NOTMUCH_CONFIG}
NOTMUCH_CONFIG="/nonexistent" export NOTMUCH_CONFIG="/nonexistent"
cat c_head3 - c_tail3 <<'EOF' | test_C ${MAIL_DIR} cat c_head3 - c_tail3 <<'EOF' | test_C ${MAIL_DIR}
notmuch_status_t st = notmuch_database_open_with_config(argv[1], notmuch_status_t st = notmuch_database_open_with_config(argv[1],
NOTMUCH_DATABASE_MODE_READ_ONLY, NOTMUCH_DATABASE_MODE_READ_ONLY,
NULL, NULL, &db, NULL); NULL, NULL, &db, NULL);
EOF EOF
NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
cat <<EOF> EXPECTED cat <<EOF> EXPECTED
== stdout == == stdout ==
db == NULL: 1 db == NULL: 1
@ -903,12 +903,12 @@ test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "create: database set to null on missing config (env)" test_begin_subtest "create: database set to null on missing config (env)"
old_NOTMUCH_CONFIG=${NOTMUCH_CONFIG} old_NOTMUCH_CONFIG=${NOTMUCH_CONFIG}
NOTMUCH_CONFIG="/nonexistent" export NOTMUCH_CONFIG="/nonexistent"
cat c_head3 - c_tail3 <<'EOF' | test_C ${MAIL_DIR} cat c_head3 - c_tail3 <<'EOF' | test_C ${MAIL_DIR}
notmuch_status_t st = notmuch_database_create_with_config(argv[1], notmuch_status_t st = notmuch_database_create_with_config(argv[1],
NULL, NULL, &db, NULL); NULL, NULL, &db, NULL);
EOF EOF
NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
cat <<EOF> EXPECTED cat <<EOF> EXPECTED
== stdout == == stdout ==
db == NULL: 1 db == NULL: 1
@ -929,11 +929,11 @@ test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "load_config: database non-null on missing config (env)" test_begin_subtest "load_config: database non-null on missing config (env)"
old_NOTMUCH_CONFIG=${NOTMUCH_CONFIG} old_NOTMUCH_CONFIG=${NOTMUCH_CONFIG}
NOTMUCH_CONFIG="/nonexistent" export NOTMUCH_CONFIG="/nonexistent"
cat c_head3 - c_tail3 <<'EOF' | test_C ${MAIL_DIR} cat c_head3 - c_tail3 <<'EOF' | test_C ${MAIL_DIR}
notmuch_status_t st = notmuch_database_load_config(argv[1], NULL, NULL, &db, NULL); notmuch_status_t st = notmuch_database_load_config(argv[1], NULL, NULL, &db, NULL);
EOF EOF
NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
cat <<EOF> EXPECTED cat <<EOF> EXPECTED
== stdout == == stdout ==
db == NULL: 0 db == NULL: 0