From: Heiko Schlittermann (HS12) Date: Mon, 18 May 2015 21:40:27 +0000 (+0200) Subject: Testsuite: Add ad= to even more outputs X-Git-Tag: exim-4_86_RC1~24 X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=b9716b3c5a3992ee5ff0bf38e9182e90dad41b9f Testsuite: Add ad= to even more outputs --- diff --git a/test/stdout/1006 b/test/stdout/1006 index 87903f4ea..663e3fee7 100644 --- a/test/stdout/1006 +++ b/test/stdout/1006 @@ -1,20 +1,20 @@ dnslookup@mx46.test.ex router = r1, transport = smtp - host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 - host 46.test.ex [V4NET.0.0.4] MX=46 + host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 ad=no + host 46.test.ex [V4NET.0.0.4] MX=46 ad=no manualroute@test.ex router = r2, transport = smtp - host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] - host 46.test.ex [V4NET.0.0.4] + host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] ad=no + host 46.test.ex [V4NET.0.0.4] ad=no dnslookup@v6.test.ex router = r1, transport = smtp - host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] + host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] ad=no dnslookup@mx46.test.ex router = r1, transport = smtp - host 46.test.ex [V4NET.0.0.4] MX=46 + host 46.test.ex [V4NET.0.0.4] MX=46 ad=no manualroute@test.ex router = r2, transport = smtp - host 46.test.ex [V4NET.0.0.4] + host 46.test.ex [V4NET.0.0.4] ad=no dnslookup@v6.test.ex is undeliverable: Unrouteable address Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected ??? 220 diff --git a/test/stdout/1009 b/test/stdout/1009 index 65a5886d0..29bbc4aa3 100644 --- a/test/stdout/1009 +++ b/test/stdout/1009 @@ -1,32 +1,32 @@ x@46.test.ex router = r1, transport = t1 - host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] - host 46.test.ex [V4NET.0.0.4] + host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] ad=no + host 46.test.ex [V4NET.0.0.4] ad=no x@mx46.test.ex router = r1, transport = t1 - host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 - host 46.test.ex [V4NET.0.0.4] MX=46 + host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 ad=no + host 46.test.ex [V4NET.0.0.4] MX=46 ad=no x@mx246.test.ex router = r1, transport = t1 - host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=10 - host ten-1.test.ex [V4NET.0.0.1] MX=10 + host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=10 ad=no + host ten-1.test.ex [V4NET.0.0.1] MX=10 ad=no x@mx4646.test.ex router = r1, transport = t1 - host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=46 - host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 - host 46b.test.ex [V4NET.0.0.5] MX=46 - host 46.test.ex [V4NET.0.0.4] MX=46 + host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=46 ad=no + host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 ad=no + host 46b.test.ex [V4NET.0.0.5] MX=46 ad=no + host 46.test.ex [V4NET.0.0.4] MX=46 ad=no x@mx46466.test.ex router = r1, transport = t1 - host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=46 - host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=46 - host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 - host 46b.test.ex [V4NET.0.0.5] MX=46 - host 46.test.ex [V4NET.0.0.4] MX=46 + host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=46 ad=no + host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=46 ad=no + host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 ad=no + host 46b.test.ex [V4NET.0.0.5] MX=46 ad=no + host 46.test.ex [V4NET.0.0.4] MX=46 ad=no x@mx46466b.test.ex router = r1, transport = t1 - host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 - host 46.test.ex [V4NET.0.0.4] MX=46 - host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=47 - host 46b.test.ex [V4NET.0.0.5] MX=47 - host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=48 + host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 ad=no + host 46.test.ex [V4NET.0.0.4] MX=46 ad=no + host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=47 ad=no + host 46b.test.ex [V4NET.0.0.5] MX=47 ad=no + host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=48 ad=no diff --git a/test/stdout/4950 b/test/stdout/4950 index bd55df45f..89a34ad49 100644 --- a/test/stdout/4950 +++ b/test/stdout/4950 @@ -1,16 +1,16 @@ userx@black-1.test.ex router = lookuphost, transport = smtp - host black-1.test.ex [1.2.3.4] + host black-1.test.ex [1.2.3.4] ad=no userx@myhost.test.ex router = lookuphost, transport = smtp - host myhost.test.ex [V4NET.10.10.11] + host myhost.test.ex [V4NET.10.10.11] ad=no userx@ten-1.test.ex router = lookuphost, transport = smtp - host other2.test.ex [V4NET.12.3.1] - host other2.test.ex [V4NET.12.3.2] + host other2.test.ex [V4NET.12.3.1] ad=no + host other2.test.ex [V4NET.12.3.2] ad=no userx@other1.test.ex router = lookuphost, transport = smtp - host other1.test.ex [V4NET.12.4.5] + host other1.test.ex [V4NET.12.4.5] ad=no userx@other99.test.ex cannot be resolved at this time: host non-exist.test.ex not found when translating other99.test.ex [V4NET.99.0.1] userx@other99.test.ex router = lookuphost, transport = smtp diff --git a/test/stdout/5301 b/test/stdout/5301 index 77c6fc727..8def2c723 100644 --- a/test/stdout/5301 +++ b/test/stdout/5301 @@ -1,9 +1,9 @@ x@[abcd::dcba] router = r0, transport = t1 - host [abcd::dcba] [abcd::dcba] + host [abcd::dcba] [abcd::dcba] ad=no x@[IPv6:cba::abc] router = r0, transport = t1 - host [ipv6:cba::abc] [cba::abc] + host [ipv6:cba::abc] [cba::abc] ad=no x@[abcd::dcba] router = r3, transport = t1 x@[IPv6:cba::abc]