pw = pwd.getpwuid(os.getuid())
user = pw.pw_name
name = pw.pw_gecos.partition(",")[0]
-fqdn = socket.getaddrinfo(socket.gethostname(), 0, 0,
- socket.SOCK_STREAM, 0, socket.AI_CANONNAME)[0][3]
+
for l in sys.stdin:
if l[:4] == "08: ":
- l = l.replace(user, "USERNAME", 1).replace("@" + fqdn, "@FQDN", 1)
- l = l.replace(".(none)", "", 1).replace(".localdomain", "", 1)
+ l = l.replace(user, "USERNAME", 1)
elif l[:4] == "10: ":
l = l.replace("'" + name, "'USER_FULL_NAME", 1)
sys.stdout.write(l)
05: 'unread;inbox'
06: ''
07: 'true'
-08: 'USERNAME@FQDN'
+08: 'USERNAME@localhost'
09: 'NULL'
10: 'USER_FULL_NAME'
+11: '8000'
== stderr ==
EOF
unset MAILDIR
}
EOF
rm -f ${ovconfig}
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
cat <<'EOF' >EXPECTED
== stdout ==
test.key1 = overridden-home
}
EOF
rm -f ${ovconfig}
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
cat <<'EOF' >EXPECTED
== stdout ==
test.key1 = overridden-xdg
}
EOF
rm -f ${ovconfig}
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
cat <<'EOF' >EXPECTED
== stdout ==
test.key1 = overridden-xdg-profile
}
EOF
#rm -f ${ovconfig}
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
cat <<'EOF' >EXPECTED
== stdout ==
test.key1 = overridden-profile
printf("NOT RUN");
}
EOF
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
cat <<'EOF' >EXPECTED
== stdout ==
== stderr ==
printf("test.key2 = %s\n", val);
}
EOF
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
unset NOTMUCH_DATABASE
cat <<'EOF' >EXPECTED
== stdout ==
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
05: 'unread;inbox'
06: ''
07: 'true'
-08: 'USERNAME@FQDN'
+08: 'USERNAME@localhost'
09: 'NULL'
10: 'USER_FULL_NAME'
+11: '8000'
== stderr ==
EOF
test_expect_equal_file EXPECTED OUTPUT.clean
}
EOF
rm -f ${ovconfig}
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
cat <<'EOF' >EXPECTED
== stdout ==
test.key1 = overridden-home
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