From b5a60d02b6983fca92f422b88f5f03f7889a1ace Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12)" Date: Sat, 16 May 2015 22:24:38 +0200 Subject: [PATCH 1/1] =?utf8?q?Testsuite:=20Munge=20the=20output=20to=20fit?= =?utf8?q?=20the=20ad=3D=E2=80=A6=20lines?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- test/runtest | 1 + test/stdout/0047 | 6 +- test/stdout/0054 | 2 +- test/stdout/0078 | 4 +- test/stdout/0089 | 2 +- test/stdout/0161 | 4 +- test/stdout/0183 | 12 ++-- test/stdout/0186 | 4 +- test/stdout/0187 | 6 +- test/stdout/0190 | 162 +++++++++++++++++++++++------------------------ test/stdout/0239 | 2 +- test/stdout/0344 | 8 +-- test/stdout/0350 | 4 +- test/stdout/0364 | 4 +- test/stdout/0368 | 6 +- test/stdout/0430 | 26 ++++---- test/stdout/0434 | 2 +- test/stdout/0463 | 2 +- test/stdout/0466 | 2 +- test/stdout/0545 | 4 +- test/stdout/0557 | 6 +- test/stdout/5204 | 4 +- test/stdout/5300 | 2 +- 23 files changed, 138 insertions(+), 137 deletions(-) diff --git a/test/runtest b/test/runtest index 62ab01bac..70f1d9b4b 100755 --- a/test/runtest +++ b/test/runtest @@ -676,6 +676,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/^\s+host\s(\S+)\s+(\S+)/ host $1 $2/; s/^\s+(host\s\S+\s\S+)\s+(port=.*)/ host $1 $2/; s/^\s+(host\s\S+\s\S+)\s+(?=MX=)/ $1 /; + s/^\s+host\s.*?\K\s+(ad=\S+)/ $1/; s/host\s\Q$parm_ipv4\E\s\[\Q$parm_ipv4\E\]/host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]/; s/host\s\Q$parm_ipv6\E\s\[\Q$parm_ipv6\E\]/host ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]/; s/\b\Q$parm_ipv4\E\b/ip4.ip4.ip4.ip4/g; diff --git a/test/stdout/0047 b/test/stdout/0047 index 5d5fb5431..c3ba3992f 100644 --- a/test/stdout/0047 +++ b/test/stdout/0047 @@ -1,9 +1,9 @@ xx@domain1 router = domainlist, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no xx@route1.ex router = domainlist, transport = smtp - host ten-2.test.ex [V4NET.0.0.2] ad=no + host ten-2.test.ex [V4NET.0.0.2] ad=no xx@domain3 router = domainlist, transport = smtp - host ten-3.test.ex [V4NET.0.0.3] ad=no + host ten-3.test.ex [V4NET.0.0.3] ad=no diff --git a/test/stdout/0054 b/test/stdout/0054 index e65ab29d4..14ad207f2 100644 --- a/test/stdout/0054 +++ b/test/stdout/0054 @@ -1,4 +1,4 @@ xxx@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no xxx@ten-2.test.ex is undeliverable: Unrouteable address diff --git a/test/stdout/0078 b/test/stdout/0078 index 45f3678f6..90987c27c 100644 --- a/test/stdout/0078 +++ b/test/stdout/0078 @@ -3,8 +3,8 @@ xx@mxt6.test.ex host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no myhost.test.ex@mxt1.test.ex router = self, transport = remote_smtp - host myhost.test.ex [V4NET.10.10.10] ad=no + host myhost.test.ex [V4NET.10.10.10] ad=no xx@mxt1.test.ex router = self2, transport = remote_smtp - host myhost.test.ex [V4NET.10.10.10] ad=no + host myhost.test.ex [V4NET.10.10.10] ad=no xx@not.exist is undeliverable: Unrouteable address diff --git a/test/stdout/0089 b/test/stdout/0089 index a075e1cd5..6355d957f 100644 --- a/test/stdout/0089 +++ b/test/stdout/0089 @@ -36,5 +36,5 @@ ABCD@test.ex router = select, transport = dummy XYZ@ten-1.test.ex router = manual, transport = dummy - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no xyz@ten-1.test.ex is undeliverable: unrouteable mail domain "ten-1.test.ex" diff --git a/test/stdout/0161 b/test/stdout/0161 index a7f7eca3d..cf19af249 100644 --- a/test/stdout/0161 +++ b/test/stdout/0161 @@ -3,10 +3,10 @@ xx@mxt6.test.ex host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no myhost.test.ex@mxt1.test.ex router = self, transport = remote_smtp - host myhost.test.ex [V4NET.10.10.10] ad=no + host myhost.test.ex [V4NET.10.10.10] ad=no xx@mxt1.test.ex router = self2, transport = remote_smtp - host myhost.test.ex [V4NET.10.10.10] ad=no + host myhost.test.ex [V4NET.10.10.10] ad=no xx@not.exist is undeliverable: Unrouteable address ff@mxt1.test.ex is undeliverable: lowest numbered MX record points to local host fff@mxt1.test.ex is undeliverable: lookup of host "fff" failed in fail router diff --git a/test/stdout/0183 b/test/stdout/0183 index 888e7a3c1..da07284cf 100644 --- a/test/stdout/0183 +++ b/test/stdout/0183 @@ -2,31 +2,31 @@ userx@test.again.dns cannot be resolved at this time: host lookup did not comple abcd@test.again.dns cannot be resolved at this time: host lookup did not complete abcd@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no usery@test.again.dns cannot be resolved at this time: host lookup for test.again.dns did not complete (DNS timeout?) userz@test.again.dns cannot be resolved at this time: host lookup for test.again.dns did not complete (DNS timeout?) xyz@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no userx@test.fail.dns cannot be resolved at this time: host lookup did not complete abcd@test.fail.dns cannot be resolved at this time: host lookup did not complete abcd@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no usery@test.fail.dns cannot be resolved at this time: host lookup for test.fail.dns did not complete (DNS timeout?) userz@test.fail.dns cannot be resolved at this time: host lookup for test.fail.dns did not complete (DNS timeout?) xyz@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no userx@nonexist.test.ex is undeliverable: Unrouteable address abcd@nonexist.test.ex is undeliverable: Unrouteable address abcd@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no usery@nonexist.test.ex cannot be resolved at this time: lookup of host "nonexist.test.ex" failed in useryz router userz@nonexist.test.ex cannot be resolved at this time: lookup of host "nonexist.test.ex" failed in useryz router xyz@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no srv@test.again.dns cannot be resolved at this time: host lookup did not complete srv@test.fail.dns cannot be resolved at this time: host lookup did not complete diff --git a/test/stdout/0186 b/test/stdout/0186 index bfe0227cc..142f07f5f 100644 --- a/test/stdout/0186 +++ b/test/stdout/0186 @@ -1,6 +1,6 @@ userx@other2.test.ex router = lookuphost, transport = smtp - host other2.test.ex [V4NET.12.3.1] ad=no + host other2.test.ex [V4NET.12.3.1] ad=no userx@ten-5-6.test.ex router = domainlist, transport = smtp - host ten-5-6.test.ex [V4NET.0.0.5] ad=no + host ten-5-6.test.ex [V4NET.0.0.5] ad=no diff --git a/test/stdout/0187 b/test/stdout/0187 index be62b6e44..2bfd2b80a 100644 --- a/test/stdout/0187 +++ b/test/stdout/0187 @@ -1,9 +1,9 @@ userx@other2.test.ex router = lookuphost2, transport = smtp - host other2.test.ex [V4NET.12.3.1] ad=no + host other2.test.ex [V4NET.12.3.1] ad=no userx@ten-5-6.test.ex router = domainlist, transport = smtp - host ten-5-6.test.ex [V4NET.0.0.5] ad=no + host ten-5-6.test.ex [V4NET.0.0.5] ad=no userx@mxt7.test.ex router = lookuphost, transport = smtp host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no @@ -12,7 +12,7 @@ userx@mxt9.test.ex host ten-3.test.ex [V4NET.0.0.3] MX=7 ad=no userx@eximtesthost.test.ex router = lookuphost2, transport = smtp - host eximtesthost.test.ex [ip4.ip4.ip4.ip4] ad=no + host eximtesthost.test.ex [ip4.ip4.ip4.ip4] ad=no userx@localhost is undeliverable: Unrouteable address userx@mxt10.test.ex is undeliverable: all relevant MX records point to non-existent hosts userx@mxt11.test.ex is undeliverable: all relevant MX records point to non-existent hosts diff --git a/test/stdout/0190 b/test/stdout/0190 index 351d70722..4308a1401 100644 --- a/test/stdout/0190 +++ b/test/stdout/0190 @@ -1,114 +1,114 @@ x@x router = others, transport = smtp2 - host V4NET.0.0.3 [V4NET.0.0.3] ad=no - host V4NET.0.0.2 [V4NET.0.0.2] ad=no - host V4NET.0.0.1 [V4NET.0.0.1] ad=no + host V4NET.0.0.3 [V4NET.0.0.3] ad=no + host V4NET.0.0.2 [V4NET.0.0.2] ad=no + host V4NET.0.0.1 [V4NET.0.0.1] ad=no x@y router = others, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] ad=no - host V4NET.0.0.2 [V4NET.0.0.2] ad=no - host V4NET.0.0.3 [V4NET.0.0.3] ad=no + host V4NET.0.0.1 [V4NET.0.0.1] ad=no + host V4NET.0.0.2 [V4NET.0.0.2] ad=no + host V4NET.0.0.3 [V4NET.0.0.3] ad=no x@z router = others, transport = smtp2 - host V4NET.0.0.3 [V4NET.0.0.3] ad=no - host V4NET.0.0.2 [V4NET.0.0.2] ad=no - host V4NET.0.0.1 [V4NET.0.0.1] ad=no + host V4NET.0.0.3 [V4NET.0.0.3] ad=no + host V4NET.0.0.2 [V4NET.0.0.2] ad=no + host V4NET.0.0.1 [V4NET.0.0.1] ad=no x@batch router = batched, transport = smtp2 - host V4NET.0.0.3 [V4NET.0.0.3] ad=no - host V4NET.0.0.2 [V4NET.0.0.2] ad=no - host V4NET.0.0.1 [V4NET.0.0.1] ad=no - host V4NET.0.0.4 [V4NET.0.0.4] ad=no - host V4NET.0.0.5 [V4NET.0.0.5] ad=no - host V4NET.0.0.6 [V4NET.0.0.6] ad=no - host V4NET.0.0.7 [V4NET.0.0.7] ad=no + host V4NET.0.0.3 [V4NET.0.0.3] ad=no + host V4NET.0.0.2 [V4NET.0.0.2] ad=no + host V4NET.0.0.1 [V4NET.0.0.1] ad=no + host V4NET.0.0.4 [V4NET.0.0.4] ad=no + host V4NET.0.0.5 [V4NET.0.0.5] ad=no + host V4NET.0.0.6 [V4NET.0.0.6] ad=no + host V4NET.0.0.7 [V4NET.0.0.7] ad=no y@batch router = batched, transport = smtp2 - host V4NET.0.0.2 [V4NET.0.0.2] ad=no - host V4NET.0.0.1 [V4NET.0.0.1] ad=no - host V4NET.0.0.3 [V4NET.0.0.3] ad=no - host V4NET.0.0.6 [V4NET.0.0.6] ad=no - host V4NET.0.0.4 [V4NET.0.0.4] ad=no - host V4NET.0.0.5 [V4NET.0.0.5] ad=no - host V4NET.0.0.7 [V4NET.0.0.7] ad=no + host V4NET.0.0.2 [V4NET.0.0.2] ad=no + host V4NET.0.0.1 [V4NET.0.0.1] ad=no + host V4NET.0.0.3 [V4NET.0.0.3] ad=no + host V4NET.0.0.6 [V4NET.0.0.6] ad=no + host V4NET.0.0.4 [V4NET.0.0.4] ad=no + host V4NET.0.0.5 [V4NET.0.0.5] ad=no + host V4NET.0.0.7 [V4NET.0.0.7] ad=no z@batch router = batched, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] ad=no - host V4NET.0.0.3 [V4NET.0.0.3] ad=no - host V4NET.0.0.2 [V4NET.0.0.2] ad=no - host V4NET.0.0.5 [V4NET.0.0.5] ad=no - host V4NET.0.0.4 [V4NET.0.0.4] ad=no - host V4NET.0.0.6 [V4NET.0.0.6] ad=no - host V4NET.0.0.7 [V4NET.0.0.7] ad=no + host V4NET.0.0.1 [V4NET.0.0.1] ad=no + host V4NET.0.0.3 [V4NET.0.0.3] ad=no + host V4NET.0.0.2 [V4NET.0.0.2] ad=no + host V4NET.0.0.5 [V4NET.0.0.5] ad=no + host V4NET.0.0.4 [V4NET.0.0.4] ad=no + host V4NET.0.0.6 [V4NET.0.0.6] ad=no + host V4NET.0.0.7 [V4NET.0.0.7] ad=no x@batch2 router = batched, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] ad=no - host V4NET.0.0.2 [V4NET.0.0.2] ad=no - host V4NET.0.0.3 [V4NET.0.0.3] ad=no - host V4NET.0.0.4 [V4NET.0.0.4] ad=no - host V4NET.0.0.5 [V4NET.0.0.5] ad=no - host V4NET.0.0.6 [V4NET.0.0.6] ad=no - host V4NET.0.0.7 [V4NET.0.0.7] ad=no + host V4NET.0.0.1 [V4NET.0.0.1] ad=no + host V4NET.0.0.2 [V4NET.0.0.2] ad=no + host V4NET.0.0.3 [V4NET.0.0.3] ad=no + host V4NET.0.0.4 [V4NET.0.0.4] ad=no + host V4NET.0.0.5 [V4NET.0.0.5] ad=no + host V4NET.0.0.6 [V4NET.0.0.6] ad=no + host V4NET.0.0.7 [V4NET.0.0.7] ad=no y@batch2 router = batched, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] ad=no - host V4NET.0.0.2 [V4NET.0.0.2] ad=no - host V4NET.0.0.3 [V4NET.0.0.3] ad=no - host V4NET.0.0.4 [V4NET.0.0.4] ad=no - host V4NET.0.0.5 [V4NET.0.0.5] ad=no - host V4NET.0.0.6 [V4NET.0.0.6] ad=no - host V4NET.0.0.7 [V4NET.0.0.7] ad=no + host V4NET.0.0.1 [V4NET.0.0.1] ad=no + host V4NET.0.0.2 [V4NET.0.0.2] ad=no + host V4NET.0.0.3 [V4NET.0.0.3] ad=no + host V4NET.0.0.4 [V4NET.0.0.4] ad=no + host V4NET.0.0.5 [V4NET.0.0.5] ad=no + host V4NET.0.0.6 [V4NET.0.0.6] ad=no + host V4NET.0.0.7 [V4NET.0.0.7] ad=no x@batch3 router = batched2, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] ad=no - host V4NET.0.0.2 [V4NET.0.0.2] ad=no - host V4NET.0.0.3 [V4NET.0.0.3] ad=no - host V4NET.0.0.4 [V4NET.0.0.4] ad=no - host V4NET.0.0.5 [V4NET.0.0.5] ad=no - host V4NET.0.0.6 [V4NET.0.0.6] ad=no - host V4NET.0.0.7 [V4NET.0.0.7] ad=no + host V4NET.0.0.1 [V4NET.0.0.1] ad=no + host V4NET.0.0.2 [V4NET.0.0.2] ad=no + host V4NET.0.0.3 [V4NET.0.0.3] ad=no + host V4NET.0.0.4 [V4NET.0.0.4] ad=no + host V4NET.0.0.5 [V4NET.0.0.5] ad=no + host V4NET.0.0.6 [V4NET.0.0.6] ad=no + host V4NET.0.0.7 [V4NET.0.0.7] ad=no y@batch3 router = batched2, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] ad=no - host V4NET.0.0.2 [V4NET.0.0.2] ad=no - host V4NET.0.0.3 [V4NET.0.0.3] ad=no - host V4NET.0.0.4 [V4NET.0.0.4] ad=no - host V4NET.0.0.5 [V4NET.0.0.5] ad=no - host V4NET.0.0.6 [V4NET.0.0.6] ad=no - host V4NET.0.0.7 [V4NET.0.0.7] ad=no + host V4NET.0.0.1 [V4NET.0.0.1] ad=no + host V4NET.0.0.2 [V4NET.0.0.2] ad=no + host V4NET.0.0.3 [V4NET.0.0.3] ad=no + host V4NET.0.0.4 [V4NET.0.0.4] ad=no + host V4NET.0.0.5 [V4NET.0.0.5] ad=no + host V4NET.0.0.6 [V4NET.0.0.6] ad=no + host V4NET.0.0.7 [V4NET.0.0.7] ad=no x@batch4 router = batched2, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] ad=no - host V4NET.0.0.2 [V4NET.0.0.2] ad=no - host V4NET.0.0.3 [V4NET.0.0.3] ad=no - host V4NET.0.0.5 [V4NET.0.0.5] ad=no - host V4NET.0.0.4 [V4NET.0.0.4] ad=no - host V4NET.0.0.6 [V4NET.0.0.6] ad=no - host V4NET.0.0.7 [V4NET.0.0.7] ad=no + host V4NET.0.0.1 [V4NET.0.0.1] ad=no + host V4NET.0.0.2 [V4NET.0.0.2] ad=no + host V4NET.0.0.3 [V4NET.0.0.3] ad=no + host V4NET.0.0.5 [V4NET.0.0.5] ad=no + host V4NET.0.0.4 [V4NET.0.0.4] ad=no + host V4NET.0.0.6 [V4NET.0.0.6] ad=no + host V4NET.0.0.7 [V4NET.0.0.7] ad=no y@batch4 router = batched2, transport = smtp2 - host V4NET.0.0.2 [V4NET.0.0.2] ad=no - host V4NET.0.0.1 [V4NET.0.0.1] ad=no - host V4NET.0.0.3 [V4NET.0.0.3] ad=no - host V4NET.0.0.5 [V4NET.0.0.5] ad=no - host V4NET.0.0.6 [V4NET.0.0.6] ad=no - host V4NET.0.0.4 [V4NET.0.0.4] ad=no - host V4NET.0.0.7 [V4NET.0.0.7] ad=no + host V4NET.0.0.2 [V4NET.0.0.2] ad=no + host V4NET.0.0.1 [V4NET.0.0.1] ad=no + host V4NET.0.0.3 [V4NET.0.0.3] ad=no + host V4NET.0.0.5 [V4NET.0.0.5] ad=no + host V4NET.0.0.6 [V4NET.0.0.6] ad=no + host V4NET.0.0.4 [V4NET.0.0.4] ad=no + host V4NET.0.0.7 [V4NET.0.0.7] ad=no userx@bdomain1 router = r3, transport = smtp2 - host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] ad=no - host 127.0.0.1 [127.0.0.1] ad=no - host the.local.host.name [ip4.ip4.ip4.ip4] ad=no + host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] ad=no + host 127.0.0.1 [127.0.0.1] ad=no + host the.local.host.name [ip4.ip4.ip4.ip4] ad=no userx@bdomain2 router = r3, transport = smtp2 - host the.local.host.name [ip4.ip4.ip4.ip4] ad=no - host 127.0.0.1 [127.0.0.1] ad=no - host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] ad=no + host the.local.host.name [ip4.ip4.ip4.ip4] ad=no + host 127.0.0.1 [127.0.0.1] ad=no + host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] ad=no userx@bdomain3 router = r3, transport = smtp2 - host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] ad=no - host 127.0.0.1 [127.0.0.1] ad=no - host the.local.host.name [ip4.ip4.ip4.ip4] ad=no + host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] ad=no + host 127.0.0.1 [127.0.0.1] ad=no + host the.local.host.name [ip4.ip4.ip4.ip4] ad=no ******** SERVER ******** Listening on port 1224 ... diff --git a/test/stdout/0239 b/test/stdout/0239 index 64edde126..ed651522a 100644 --- a/test/stdout/0239 +++ b/test/stdout/0239 @@ -10,4 +10,4 @@ userx@localhost host a.host.name ad=no userx@smtp router = sss, transport = smtp - host 127.0.0.1 [127.0.0.1] ad=no + host 127.0.0.1 [127.0.0.1] ad=no diff --git a/test/stdout/0344 b/test/stdout/0344 index 7d49c555c..74097f1b4 100644 --- a/test/stdout/0344 +++ b/test/stdout/0344 @@ -1,12 +1,12 @@ x@d1 router = r1, transport = t1 - host 192.168.4.3 [192.168.4.3] ad=no + host 192.168.4.3 [192.168.4.3] ad=no x@d2 router = r2, transport = t2 - host V4NET.9.8.7 [V4NET.9.8.7] ad=no + host V4NET.9.8.7 [V4NET.9.8.7] ad=no x@d30 router = r3, transport = t4 - host 1.2.3.4 [1.2.3.4] ad=no + host 1.2.3.4 [1.2.3.4] ad=no x@d31 router = r3, transport = t3 - host 1.2.3.4 [1.2.3.4] ad=no + host 1.2.3.4 [1.2.3.4] ad=no diff --git a/test/stdout/0350 b/test/stdout/0350 index 8631b6f2b..06d4e8c3c 100644 --- a/test/stdout/0350 +++ b/test/stdout/0350 @@ -1,4 +1,4 @@ xx@yy router = r1, transport = t1 - host 1.2.3.4 [1.2.3.4] ad=no - host other2.test.ex [V4NET.12.3.2] ad=no + host 1.2.3.4 [1.2.3.4] ad=no + host other2.test.ex [V4NET.12.3.2] ad=no diff --git a/test/stdout/0364 b/test/stdout/0364 index 4b3ad2308..5ea904586 100644 --- a/test/stdout/0364 +++ b/test/stdout/0364 @@ -7,9 +7,9 @@ solik@otherhost.sub.test.ex is undeliverable: Can't route to otherhost.sub.test. xxx@ten-1.test.ex <-- xxx@ten-1 router = r2, transport = t1 - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no xxx@testsub.sub.test.ex <-- xxx@testsub.test.ex <-- xxx@testsub router = r2, transport = t1 - host testsub.sub.test.ex [V4NET.99.0.3] ad=no + host testsub.sub.test.ex [V4NET.99.0.3] ad=no diff --git a/test/stdout/0368 b/test/stdout/0368 index 7302d740b..153442435 100644 --- a/test/stdout/0368 +++ b/test/stdout/0368 @@ -9,6 +9,6 @@ x@mxt14.test.ex host ten-5-6.test.ex [V4NET.0.0.6] MX=4 ad=no x@manualroute router = r1, transport = t1 - host ten-1.test.ex [V4NET.0.0.1] ad=no - host ten-1.test.ex [V4NET.0.0.1] ad=no - host ten-2.test.ex [V4NET.0.0.2] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-2.test.ex [V4NET.0.0.2] ad=no diff --git a/test/stdout/0430 b/test/stdout/0430 index 75887bedc..425296e12 100644 --- a/test/stdout/0430 +++ b/test/stdout/0430 @@ -1,19 +1,19 @@ x@manual.route router = r1, transport = t1 - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no x@manual.route router = r1, transport = t1 - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no - host ten-6.test.ex [V4NET.0.0.6] ad=no + host ten-6.test.ex [V4NET.0.0.6] ad=no x@manual.route router = r1, transport = t1 host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no - host ten-6.test.ex [V4NET.0.0.6] ad=no + host ten-6.test.ex [V4NET.0.0.6] ad=no x@random.manual.route router = r2, transport = t1 host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no @@ -22,38 +22,38 @@ x@random.manual.route router = r2, transport = t1 host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no x@random.manual.route router = r2, transport = t1 - host ten-6.test.ex [V4NET.0.0.6] ad=no + host ten-6.test.ex [V4NET.0.0.6] ad=no host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no y@random.manual.route router = r2, transport = t1 host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no - host ten-6.test.ex [V4NET.0.0.6] ad=no - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-6.test.ex [V4NET.0.0.6] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no x@random.manual.route router = r2, transport = t1 - host ten-6.test.ex [V4NET.0.0.6] ad=no + host ten-6.test.ex [V4NET.0.0.6] ad=no host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no x@manual.route router = r1, transport = t1 - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no x@manual.route cannot be resolved at this time: lowest numbered MX record points to local host x@manual.route router = r1, transport = t1 host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5 ad=no - host ten-6.test.ex [V4NET.0.0.6] ad=no + host ten-6.test.ex [V4NET.0.0.6] ad=no x@manual.route is undeliverable: lowest numbered MX record points to local host x@random.manual.route cannot be resolved at this time: lookup of host "localhost.test.ex" failed in r2 router x@random.manual.route router = r2, transport = t1 - host ten-6.test.ex [V4NET.0.0.6] ad=no + host ten-6.test.ex [V4NET.0.0.6] ad=no host ten-1.test.ex [V4NET.0.0.1] MX=6 ad=no x@manual.route router = r1, transport = t1 diff --git a/test/stdout/0434 b/test/stdout/0434 index ed4e976ec..7b8cf4afc 100644 --- a/test/stdout/0434 +++ b/test/stdout/0434 @@ -1,4 +1,4 @@ a@b router = r1, transport = t1 - host 1.2.3.4 [1.2.3.4] ad=no + host 1.2.3.4 [1.2.3.4] ad=no a@b cannot be resolved at this time: remote host address is the local host diff --git a/test/stdout/0463 b/test/stdout/0463 index 27d6cfe31..5ede511b7 100644 --- a/test/stdout/0463 +++ b/test/stdout/0463 @@ -1,4 +1,4 @@ x@ten-1.test.ex <-- x@ten-1 router = all, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no diff --git a/test/stdout/0466 b/test/stdout/0466 index 71fd0dada..dc6e2a757 100644 --- a/test/stdout/0466 +++ b/test/stdout/0466 @@ -1,3 +1,3 @@ x@y router = r1, transport = t1 - host 127.0.0.1 [127.0.0.1] ad=no + host 127.0.0.1 [127.0.0.1] ad=no diff --git a/test/stdout/0545 b/test/stdout/0545 index 9936abc5e..5018b9799 100644 --- a/test/stdout/0545 +++ b/test/stdout/0545 @@ -1,7 +1,7 @@ userx@alias-eximtesthost.test.ex <-- userx@alias-eximtesthost router = dns, transport = smtp - host eximtesthost.test.ex [ip4.ip4.ip4.ip4] ad=no + host eximtesthost.test.ex [ip4.ip4.ip4.ip4] ad=no userx@alias-eximtesthost.test.ex router = dns, transport = smtp - host eximtesthost.test.ex [ip4.ip4.ip4.ip4] ad=no + host eximtesthost.test.ex [ip4.ip4.ip4.ip4] ad=no diff --git a/test/stdout/0557 b/test/stdout/0557 index cd31b5c02..031265dd8 100644 --- a/test/stdout/0557 +++ b/test/stdout/0557 @@ -3,11 +3,11 @@ userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer userx@test.ex router = r1, transport = t1 - host 127.0.0.1 [127.0.0.1] ad=no + host 127.0.0.1 [127.0.0.1] ad=no userx@test.ex router = r1, transport = t1 - host 127.0.0.1 [127.0.0.1] ad=no - host 127.0.0.2 [127.0.0.2] ad=no + host 127.0.0.1 [127.0.0.1] ad=no + host 127.0.0.2 [127.0.0.2] ad=no userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer userx@test.ex is undeliverable: Unrouteable address userx@test.ex is undeliverable: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=fail diff --git a/test/stdout/5204 b/test/stdout/5204 index 7c61dad63..361f114d5 100644 --- a/test/stdout/5204 +++ b/test/stdout/5204 @@ -5,10 +5,10 @@ "DEFER cannot route this one (DEFER)"@some.host cannot be resolved at this time: cannot route this one (DEFER) "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host router = q, transport = other_smtp - host ten-1.test.ex [V4NET.0.0.1] ad=no + host ten-1.test.ex [V4NET.0.0.1] ad=no PASS@some.host router = s, transport = smtp - host 127.0.0.1 [127.0.0.1] ad=no + host 127.0.0.1 [127.0.0.1] ad=no "FREEZE cannot route this one (FREEZE)"@some.host cannot be resolved at this time: cannot route this one (FREEZE) postmaster@test.ex <-- "REDIRECT postmaster@test.ex"@some.host diff --git a/test/stdout/5300 b/test/stdout/5300 index 5995ccd4f..855ff5671 100644 --- a/test/stdout/5300 +++ b/test/stdout/5300 @@ -1,6 +1,6 @@ x@[V4NET.9.8.7] router = r1, transport = t1 - host [V4NET.9.8.7] [V4NET.9.8.7] ad=no + host [V4NET.9.8.7] [V4NET.9.8.7] ad=no x@[127.0.0.1] router = r3, transport = t1 0m sss 10HmaX-0005vi-00 -- 2.30.2