X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=inline;f=test%2FT590-libconfig.sh;h=292778d5652a7f5821a642e3c592cfa62273cfb0;hb=3787fe6c84ae223ba8c34920c3a2495c71abfe6c;hp=49cc382a2ceca1cfce585cc12a4b7c724ad7571f;hpb=863b2431853385441f9fcbc22b9ff4e963091440;p=notmuch

diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
index 49cc382a..292778d5 100755
--- a/test/T590-libconfig.sh
+++ b/test/T590-libconfig.sh
@@ -384,6 +384,9 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} '' %NULL%
     }
 }
 EOF
+
+notmuch_passwd_sanitize < OUTPUT > OUTPUT.clean
+
 cat <<'EOF' >EXPECTED
 == stdout ==
 MAIL_DIR
@@ -394,13 +397,13 @@ MAIL_DIR/.notmuch/backups
 inbox;unread
 NULL
 true
+USERNAME@FQDN
 NULL
-NULL
-NULL
+USER_FULL_NAME
 == stderr ==
 EOF
 unset MAILDIR
-test_expect_equal_file EXPECTED OUTPUT
+test_expect_equal_file EXPECTED OUTPUT.clean
 
 backup_database
 test_begin_subtest "override config from \${NOTMUCH_CONFIG}"
@@ -623,9 +626,6 @@ EOF
 
 
 test_begin_subtest "notmuch_database_get_config (ndlc)"
-echo NOTMUCH_CONFIG=$NOTMUCH_CONFIG
-echo NOTMUCH_PROFILE=$NOTMUCH_PROFILE
-echo HOME=$HOME
 cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
 {
    EXPECT0(notmuch_database_get_config (db, "test.key1", &val));
@@ -727,6 +727,8 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} /nonexistent %NULL%
     }
 }
 EOF
+
+notmuch_passwd_sanitize < OUTPUT > OUTPUT.clean
 cat <<'EOF' >EXPECTED
 == stdout ==
 MAIL_DIR
@@ -737,12 +739,12 @@ MAIL_DIR/.notmuch/backups
 inbox;unread
 NULL
 true
+USERNAME@FQDN
 NULL
-NULL
-NULL
+USER_FULL_NAME
 == stderr ==
 EOF
-test_expect_equal_file EXPECTED OUTPUT
+test_expect_equal_file EXPECTED OUTPUT.clean
 
 backup_database
 test_begin_subtest "override config from \${HOME}/.notmuch-config (ndlc)"