diff options
| author | David Bremner <david@tethera.net> | 2021-09-20 07:19:01 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-09-20 07:19:01 -0300 |
| commit | 0deced676415d581d00e8346f490aa139b1f86ff (patch) | |
| tree | 17337ff09b92075d59ee8734d20c8dfd9f2685b0 /test | |
| parent | 3901179d2ed93f7ee48eec05f417b275f411293f (diff) | |
| parent | 8e59438025c88ebd83a78cf12c06ff954d979e01 (diff) | |
Merge tag '0.33.1' into debian/bullseye-backports
notmuch 0.33.1 release
Diffstat (limited to 'test')
| -rwxr-xr-x | test/T590-libconfig.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index 41f67bae..59b82a6f 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -12,12 +12,10 @@ import os, sys, pwd, socket 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) @@ -416,7 +414,7 @@ cat <<'EOF' >EXPECTED 05: 'unread;inbox' 06: '' 07: 'true' -08: 'USERNAME@FQDN' +08: 'USERNAME@localhost' 09: 'NULL' 10: 'USER_FULL_NAME' 11: '8000' @@ -761,7 +759,7 @@ cat <<'EOF' >EXPECTED 05: 'unread;inbox' 06: '' 07: 'true' -08: 'USERNAME@FQDN' +08: 'USERNAME@localhost' 09: 'NULL' 10: 'USER_FULL_NAME' 11: '8000' |