Update tests after reformatting exim -bt message

diff --git a/test/stdout/0045 b/test/stdout/0045
index 3f0ffa0bb85afc6ee4a682f97fdeb63e50a9d96c..5c998117d93df69e0d31c44c402a5ef9da80c359 100644 (file)
--- a/test/stdout/0045
+++ b/test/stdout/0045
@@ -1,17 +1,10 @@
-userx@eximtesthost.test.ex cannot be resolved at this time:
-  remote host address is the local host
-userx@mxt1.test.ex cannot be resolved at this time:
-  lowest numbered MX record points to local host
-userx@mxt2.test.ex is undeliverable:
-  all relevant MX records point to non-existent hosts
-userx@mxt3.test.ex is undeliverable:
-  all relevant MX records point to non-existent hosts
-userx@mxt4.test.ex cannot be resolved at this time:
-  lowest numbered MX record points to local host
-userx@mxt5.test.ex cannot be resolved at this time:
-  lowest numbered MX record points to local host
-userx@mxt5.test.ex cannot be resolved at this time:
-  lowest numbered MX record points to local host
+userx@eximtesthost.test.ex cannot be resolved at this time: remote host address is the local host
+userx@mxt1.test.ex cannot be resolved at this time: lowest numbered MX record points to local host
+userx@mxt2.test.ex is undeliverable: all relevant MX records point to non-existent hosts
+userx@mxt3.test.ex is undeliverable: all relevant MX records point to non-existent hosts
+userx@mxt4.test.ex cannot be resolved at this time: lowest numbered MX record points to local host
+userx@mxt5.test.ex cannot be resolved at this time: lowest numbered MX record points to local host
+userx@mxt5.test.ex cannot be resolved at this time: lowest numbered MX record points to local host
 userx@mxt6.test.ex
   router = lookuphost, transport = smtp
   host ten-1.test.ex [V4NET.0.0.1] MX=5

diff --git a/test/stdout/0053 b/test/stdout/0053
index 686ba5cf709e12776d8a39748edd10c1ed556b0d..079ba96f581577b7f363d93c70b331a3128e5c62 100644 (file)
--- a/test/stdout/0053
+++ b/test/stdout/0053
@@ -1,5 +1,4 @@
 userx@test.ex
     <-- bar@domain1.ex
   router = localuser, transport = local_delivery
-foobar@domain1.ex is undeliverable:
-  Unrouteable address
+foobar@domain1.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/0054 b/test/stdout/0054
index 50737244add2142268532a09a04a1e6652dd3ea7..ca26171e78ae1d2fe37897128d4042854d555dd9 100644 (file)
--- a/test/stdout/0054
+++ b/test/stdout/0054
@@ -1,5 +1,4 @@
 xxx@ten-1.test.ex
   router = lookuphost, transport = smtp
   host ten-1.test.ex [V4NET.0.0.1] 
-xxx@ten-2.test.ex is undeliverable:
-  Unrouteable address
+xxx@ten-2.test.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/0057 b/test/stdout/0057
index 306090755d6e6f0f8b476486de08fbbebf8acc72..cb1e1b4e50a61f244f172b5500d124b8254e847d 100644 (file)
--- a/test/stdout/0057
+++ b/test/stdout/0057
@@ -14,12 +14,8 @@
 **** SMTP testing: that is not a real message id!
 
 221 myhost.ex closing connection\r
-userx%myhost.ex@a.test.ex failed to verify:
-  Unrouteable address
-userx%myhost.ex@b.test.ex failed to verify:
-  Unrouteable address
-userx%myhost.ex@d.test.ex failed to verify:
-  Unrouteable address
-userx%myhost.ex@d.test.ex failed to verify:
-  Unrouteable address
+userx%myhost.ex@a.test.ex failed to verify: Unrouteable address
+userx%myhost.ex@b.test.ex failed to verify: Unrouteable address
+userx%myhost.ex@d.test.ex failed to verify: Unrouteable address
+userx%myhost.ex@d.test.ex failed to verify: Unrouteable address
 userx%myhost.ex@z.test.ex verified

diff --git a/test/stdout/0078 b/test/stdout/0078
index 6d8b4a0e5c38bd0fc9eecb687ed4e80e62a52497..272e0f224d3f53c41a89655bd8d8b6783c0da021 100644 (file)
--- a/test/stdout/0078
+++ b/test/stdout/0078
@@ -7,5 +7,4 @@ myhost.test.ex@mxt1.test.ex
 xx@mxt1.test.ex
   router = self2, transport = remote_smtp
   host myhost.test.ex [V4NET.10.10.10] 
-xx@not.exist is undeliverable:
-  Unrouteable address
+xx@not.exist is undeliverable: Unrouteable address

diff --git a/test/stdout/0085 b/test/stdout/0085
index f02de8bc8b74c4880d1461bbd4bec39443f11b27..20a669707ebc91c2bd7d5e750f16b695880b965c 100644 (file)
--- a/test/stdout/0085
+++ b/test/stdout/0085
@@ -1,16 +1,10 @@
-x@y.z failed to verify:
-  unrouteable mail domain "y.z"
+x@y.z failed to verify: unrouteable mail domain "y.z"
 x@smart.domain
   router = smart1, transport = unset
 x@test.ex
   router = smart2, transport = dummy
-x@myhost.test.ex failed to verify:
-  Unrouteable address
-x@y.z failed to verify:
-  unrouteable mail domain "y.z"
-x@smart.domain failed to verify:
-  unrouteable mail domain "smart.domain"
-x@test.ex failed to verify:
-  Unrouteable address
-x@myhost.test.ex failed to verify:
-  Unrouteable address
+x@myhost.test.ex failed to verify: Unrouteable address
+x@y.z failed to verify: unrouteable mail domain "y.z"
+x@smart.domain failed to verify: unrouteable mail domain "smart.domain"
+x@test.ex failed to verify: Unrouteable address
+x@myhost.test.ex failed to verify: Unrouteable address

diff --git a/test/stdout/0088 b/test/stdout/0088
index 74ab08e62a42a5649972e86457ab70dca8b280c1..be52996e89e337387125de5c17eb1cab1208e825 100644 (file)
--- a/test/stdout/0088
+++ b/test/stdout/0088
@@ -1,6 +1,3 @@
-xx@ten-1.test.ex cannot be resolved at this time:
-  remote host address is the local host
-xx@ten-99.test.ex cannot be resolved at this time:
-  remote host address is the local host
-xx@mxcased.test.ex cannot be resolved at this time:
-  lowest numbered MX record points to local host
+xx@ten-1.test.ex cannot be resolved at this time: remote host address is the local host
+xx@ten-99.test.ex cannot be resolved at this time: remote host address is the local host
+xx@mxcased.test.ex cannot be resolved at this time: lowest numbered MX record points to local host

diff --git a/test/stdout/0089 b/test/stdout/0089
index 02576912e1c71e67a689a79008169c65930e46cf..0238dbffbcc7d8a12adff4297dee642b9babe86b 100644 (file)
--- a/test/stdout/0089
+++ b/test/stdout/0089
@@ -37,5 +37,4 @@ ABCD@test.ex
 XYZ@ten-1.test.ex
   router = manual, transport = dummy
   host ten-1.test.ex [V4NET.0.0.1] 
-xyz@ten-1.test.ex is undeliverable:
-  unrouteable mail domain "ten-1.test.ex"
+xyz@ten-1.test.ex is undeliverable: unrouteable mail domain "ten-1.test.ex"

diff --git a/test/stdout/0123 b/test/stdout/0123
index 4a1f3051b29f7b7cb6f0c67a46d1730abe494d14..e05a98818fa96a5cc88c37341bc5fe53d4628752 100644 (file)
--- a/test/stdout/0123
+++ b/test/stdout/0123
@@ -1,6 +1,3 @@
-x@test.ex is undeliverable:
-  Unrouteable address
-y@test.ex is undeliverable:
-  Unrouteable address
-z@test.ex is undeliverable:
-  Unrouteable address
+x@test.ex is undeliverable: Unrouteable address
+y@test.ex is undeliverable: Unrouteable address
+z@test.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/0126 b/test/stdout/0126
index a522b8a2d3dbfb42107080cdf4af68c2506444d0..9160d1abf2b6b4ee50470c65b9fa906fefb4187f 100644 (file)
--- a/test/stdout/0126
+++ b/test/stdout/0126
@@ -1,2 +1 @@
-userx@test.ex is undeliverable:
-  Unrouteable address
+userx@test.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/0129 b/test/stdout/0129
index 648a034331b4c585e4dbd99f597aa3a4094fc01f..51c0da7ddaebb08b7876071821dd8691c356e1b7 100644 (file)
--- a/test/stdout/0129
+++ b/test/stdout/0129
@@ -1,4 +1,2 @@
-xxx@test.ex failed to verify:
-  Just testing
-xxx@one.test.ex failed to verify:
-  Just testing
+xxx@test.ex failed to verify: Just testing
+xxx@one.test.ex failed to verify: Just testing

diff --git a/test/stdout/0130 b/test/stdout/0130
index 9a807d39ecfaad9efbe2ac82a24f0e4e947f6443..de1944523ea33ebb5f4249b13b3ca07c5ed16d3e 100644 (file)
--- a/test/stdout/0130
+++ b/test/stdout/0130
@@ -7,5 +7,4 @@
 250 OK\r
 451 Temporary local problem - please try later\r
 221 the.local.host.name closing connection\r
-userx@not.test.ex cannot be resolved at this time:
-  remote host address is the local host
+userx@not.test.ex cannot be resolved at this time: remote host address is the local host

diff --git a/test/stdout/0141 b/test/stdout/0141
index 0acddabd8d992e1e88dd3d0ee3f0b0f173313eb5..651b2947dcee565855247b88b1c7e7769421afc0 100644 (file)
--- a/test/stdout/0141
+++ b/test/stdout/0141
@@ -1,6 +1,3 @@
-xxx@test.ex failed to verify:
-  Forced failure
-xxx@test.ex is undeliverable:
-  Forced failure
-xxx@test.ex failed to verify:
-  Unrouteable address
+xxx@test.ex failed to verify: Forced failure
+xxx@test.ex is undeliverable: Forced failure
+xxx@test.ex failed to verify: Unrouteable address

diff --git a/test/stdout/0145 b/test/stdout/0145
index 206a430c737725d8e3abc61bee336cef6badf954..85f095c8473b0e48f4700ee0b0392c3002dfe2b6 100644 (file)
--- a/test/stdout/0145
+++ b/test/stdout/0145
@@ -1,5 +1,4 @@
-x@mxt10.test.ex is undeliverable:
-  all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
+x@mxt10.test.ex is undeliverable: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
 
 **** SMTP testing session as if from host V4NET.9.8.7
 **** but without any ident (RFC 1413) callback.

diff --git a/test/stdout/0153 b/test/stdout/0153
index 93a2bd705c60c4cf5282f631287a2ce85c43af84..fefcb71e29a7273e991d91e631909ae8671d4f15 100644 (file)
--- a/test/stdout/0153
+++ b/test/stdout/0153
@@ -1,9 +1,6 @@
 abcd@test.ex verified
 yes@exists.virt.test.ex verified
-no@exists.virt.test.ex failed to verify:
-  Unrouteable address
-xx@notexists.virt.test.ex failed to verify:
-  Unrouteable address
+no@exists.virt.test.ex failed to verify: Unrouteable address
+xx@notexists.virt.test.ex failed to verify: Unrouteable address
 yes@list.test.ex verified
-no@list.test.ex failed to verify:
-  Unrouteable address
+no@list.test.ex failed to verify: Unrouteable address

diff --git a/test/stdout/0156 b/test/stdout/0156
index 357aa68c303458192fa00dd0d653e07bc7ed48dd..219af68d97ecd90a378335c31f6ce07cfe2a9ff8 100644 (file)
--- a/test/stdout/0156
+++ b/test/stdout/0156
@@ -1,7 +1,4 @@
-defer@test.ex cannot be resolved at this time:
-  error in redirect data: ":defer: forced to defer" is not permitted
+defer@test.ex cannot be resolved at this time: error in redirect data: ":defer: forced to defer" is not permitted
 file@test.ex -> /dev/null *** forbidden ***
-include@test.ex cannot be resolved at this time:
-  error in redirect data: included files not permitted
-unknown@test.ex is undeliverable:
-  Unrouteable address
+include@test.ex cannot be resolved at this time: error in redirect data: included files not permitted
+unknown@test.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/0161 b/test/stdout/0161
index 45a72f4f5dcfeabd8f69db3cdb4b0f58223fc063..0593ee3276140ce71a5cc0c90692df3f672e38a9 100644 (file)
--- a/test/stdout/0161
+++ b/test/stdout/0161
@@ -7,9 +7,6 @@ myhost.test.ex@mxt1.test.ex
 xx@mxt1.test.ex
   router = self2, transport = remote_smtp
   host myhost.test.ex [V4NET.10.10.10] 
-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
+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/0172 b/test/stdout/0172
index 9520bb415c3adde2a83ea4dac753a5c364580a5c..d36eb32d845cecc80202f40d0f4efd2d611002cd 100644 (file)
--- a/test/stdout/0172
+++ b/test/stdout/0172
@@ -1,2 +1 @@
-unknown@test.ex is undeliverable:
-  cannot route address
+unknown@test.ex is undeliverable: cannot route address

diff --git a/test/stdout/0183 b/test/stdout/0183
index 7582da94e288a08f881332f17cc084b56e52f3a0..2737f093836f253f06cd4b570a7df516a7490bf9 100644 (file)
--- a/test/stdout/0183
+++ b/test/stdout/0183
@@ -1,46 +1,32 @@
-userx@test.again.dns cannot be resolved at this time:
-  host lookup did not complete
-abcd@test.again.dns cannot be resolved at this time:
-  host lookup did not complete
+userx@test.again.dns cannot be resolved at this time: host lookup did not complete
+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] 
-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?)
+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] 
-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
+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] 
-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?)
+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] 
-userx@nonexist.test.ex is undeliverable:
-  Unrouteable address
-abcd@nonexist.test.ex is undeliverable:
-  Unrouteable address
+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] 
-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
+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] 
-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
+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/0187 b/test/stdout/0187
index 496d09c72642d755e6621d888b96b47eef594ab7..cef8628c964e4828d11b8c97f7892646f8fdd65a 100644 (file)
--- a/test/stdout/0187
+++ b/test/stdout/0187
@@ -13,11 +13,7 @@ userx@mxt9.test.ex
 userx@eximtesthost.test.ex
   router = lookuphost2, transport = smtp
   host eximtesthost.test.ex [ip4.ip4.ip4.ip4] 
-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
-userx@mxt12.test.ex is undeliverable:
-  all relevant MX records point to non-existent hosts
+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
+userx@mxt12.test.ex is undeliverable: all relevant MX records point to non-existent hosts

diff --git a/test/stdout/0200 b/test/stdout/0200
index 2d65891bd77ca5a26d1bb01b1461c49b65f30748..77b589ba59afc3946908521739d752c6341f236c 100644 (file)
--- a/test/stdout/0200
+++ b/test/stdout/0200
@@ -1,4 +1,2 @@
-xx@host.test.ex is undeliverable:
-  mail domain "host.test.ex._bad" is syntactically invalid
-yy@host.test.ex cannot be resolved at this time:
-  lookup of host "bad_host.test.ex" failed in domainlist router: syntax error in name
+xx@host.test.ex is undeliverable: mail domain "host.test.ex._bad" is syntactically invalid
+yy@host.test.ex cannot be resolved at this time: lookup of host "bad_host.test.ex" failed in domainlist router: syntax error in name

diff --git a/test/stdout/0205 b/test/stdout/0205
index 898a9248605e91180c8ef434584c19696fee5802..6e43050738124164d27c6ee29408e0fa87d38258 100644 (file)
--- a/test/stdout/0205
+++ b/test/stdout/0205
@@ -1,9 +1,9 @@
-> x%y@testhack.test.ex is undeliverable:
-  unrouteable mail domain "y"
+> x@y is undeliverable: unrouteable mail domain "y"
+    <-- x%y@testhack.test.ex
 > x%y@test.ex
   router = local_domains, transport = local_delivery
-> x%y%testhack2.test.ex@testhack.test.ex is undeliverable:
-  unrouteable mail domain "y"
+> x@y is undeliverable: unrouteable mail domain "y"
+    <-- x%y%testhack2.test.ex@testhack.test.ex
 > X@test.ex
     <-- X%test.ex@testhack.test.ex
   router = local_domains, transport = local_delivery

diff --git a/test/stdout/0235 b/test/stdout/0235
index 125382e505223b6bd90810e3e9f59bed55ebc38d..9a949fbb9b982ab5209d05b2be8d29dd63e5d9db 100644 (file)
--- a/test/stdout/0235
+++ b/test/stdout/0235
@@ -1,2 +1 @@
-xxx@myhost.test.ex is undeliverable:
-  Unrouteable address
+xxx@myhost.test.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/0238 b/test/stdout/0238
index 095a764c8a0b3889054d1842eb3111b5025972ae..0efec89544972cb901b39a23ae3805fe3d9c2ce7 100644 (file)
--- a/test/stdout/0238
+++ b/test/stdout/0238
@@ -1,4 +1,2 @@
-userx@test.ex cannot be resolved at this time:
-  failed to expand "${if eq{$local_part}" for require_files: missing 2nd string in {} after "eq"
-xxx@a.b.c cannot be resolved at this time:
-  require_files: "un/qualified" is not absolute
+userx@test.ex cannot be resolved at this time: failed to expand "${if eq{$local_part}" for require_files: missing 2nd string in {} after "eq"
+xxx@a.b.c cannot be resolved at this time: require_files: "un/qualified" is not absolute

diff --git a/test/stdout/0263 b/test/stdout/0263
index 7eaaa387b971e2103337b7e62a4bf9a08e399c36..2a4439b8c98664a66ca02e00f8e5428449283b30 100644 (file)
--- a/test/stdout/0263
+++ b/test/stdout/0263
@@ -2,5 +2,4 @@ x@domain0
   router = r2, transport = t1
 x@domain1
   router = pr1, transport = t1
-x@domain2 is undeliverable:
-  Unrouteable address
+x@domain2 is undeliverable: Unrouteable address

diff --git a/test/stdout/0265 b/test/stdout/0265
index c63771904eec0b116e832a4e8e5fad18ca72a90f..3c525af546f96030ed195d5411bcad25b7ddc026 100644 (file)
--- a/test/stdout/0265
+++ b/test/stdout/0265
@@ -1,2 +1 @@
-userx@x.y cannot be resolved at this time:
-  error in filter data: filtering not enabled
+userx@x.y cannot be resolved at this time: error in filter data: filtering not enabled

diff --git a/test/stdout/0267 b/test/stdout/0267
index ef3e9babf2a57279063d5e65dd90d2492dd1759a..146d027ddccda78bfef652f46c2254aac84b224f 100644 (file)
--- a/test/stdout/0267
+++ b/test/stdout/0267
@@ -2,5 +2,4 @@ pre-x@test.ex
   router = r3, transport = t1
 x-post@test.ex
   router = r3, transport = t1
-pre-z@test.ex is undeliverable:
-  Unrouteable address
+pre-z@test.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/0268 b/test/stdout/0268
index 6242b232d2573c8510b62152551ba5e5e1494fa6..5ef33778a5c70f641715984eb3614c6db3fc25b3 100644 (file)
--- a/test/stdout/0268
+++ b/test/stdout/0268
@@ -1,22 +1,11 @@
-CALLER@r1 cannot be resolved at this time:
-  bad owner for TESTSUITE/test-owned-by-exim
-CALLER@r2 is undeliverable:
-  Explictly Rejected
-CALLER@r3 cannot be resolved at this time:
-  bad owner for TESTSUITE/test-owned-by-exim
-CALLER@r4 is undeliverable:
-  Explictly Rejected
-CALLER@r5 is undeliverable:
-  Explictly Rejected
-CALLER@r6 cannot be resolved at this time:
-  bad group for TESTSUITE/test-owned-by-exim
-CALLER@r7 is undeliverable:
-  Explictly Rejected
-CALLER@r8 is undeliverable:
-  Explictly Rejected
-CALLER@r9 is undeliverable:
-  Explictly Rejected
-CALLER@r10 cannot be resolved at this time:
-  bad group for TESTSUITE/test-owned-by-exim
-CALLER@r11 cannot be resolved at this time:
-  bad mode (0100644) for TESTSUITE/test-owned-by-exim: 04 bit(s) unexpected
+CALLER@r1 cannot be resolved at this time: bad owner for TESTSUITE/test-owned-by-exim
+CALLER@r2 is undeliverable: Explictly Rejected
+CALLER@r3 cannot be resolved at this time: bad owner for TESTSUITE/test-owned-by-exim
+CALLER@r4 is undeliverable: Explictly Rejected
+CALLER@r5 is undeliverable: Explictly Rejected
+CALLER@r6 cannot be resolved at this time: bad group for TESTSUITE/test-owned-by-exim
+CALLER@r7 is undeliverable: Explictly Rejected
+CALLER@r8 is undeliverable: Explictly Rejected
+CALLER@r9 is undeliverable: Explictly Rejected
+CALLER@r10 cannot be resolved at this time: bad group for TESTSUITE/test-owned-by-exim
+CALLER@r11 cannot be resolved at this time: bad mode (0100644) for TESTSUITE/test-owned-by-exim: 04 bit(s) unexpected

diff --git a/test/stdout/0269 b/test/stdout/0269
index c63771904eec0b116e832a4e8e5fad18ca72a90f..3c525af546f96030ed195d5411bcad25b7ddc026 100644 (file)
--- a/test/stdout/0269
+++ b/test/stdout/0269
@@ -1,2 +1 @@
-userx@x.y cannot be resolved at this time:
-  error in filter data: filtering not enabled
+userx@x.y cannot be resolved at this time: error in filter data: filtering not enabled

diff --git a/test/stdout/0271 b/test/stdout/0271
index ef3e9babf2a57279063d5e65dd90d2492dd1759a..146d027ddccda78bfef652f46c2254aac84b224f 100644 (file)
--- a/test/stdout/0271
+++ b/test/stdout/0271
@@ -2,5 +2,4 @@ pre-x@test.ex
   router = r3, transport = t1
 x-post@test.ex
   router = r3, transport = t1
-pre-z@test.ex is undeliverable:
-  Unrouteable address
+pre-z@test.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/0272 b/test/stdout/0272
index 17f6d2b2a8849311e5754d592cd1644910a40ae2..34ef1591e4e2a08d0b01375ff75baf845116402d 100644 (file)
--- a/test/stdout/0272
+++ b/test/stdout/0272
@@ -1,22 +1,11 @@
-CALLER@r1 cannot be resolved at this time:
-  bad owner for TESTSUITE/aux-var/0272.exim
-CALLER@r2 is undeliverable:
-  Explictly Rejected
-CALLER@r3 cannot be resolved at this time:
-  bad owner for TESTSUITE/aux-var/0272.exim
-CALLER@r4 is undeliverable:
-  Explictly Rejected
-CALLER@r5 is undeliverable:
-  Explictly Rejected
-CALLER@r6 cannot be resolved at this time:
-  bad group for TESTSUITE/aux-var/0272.exim
-CALLER@r7 is undeliverable:
-  Explictly Rejected
-CALLER@r8 is undeliverable:
-  Explictly Rejected
-CALLER@r9 is undeliverable:
-  Explictly Rejected
-CALLER@r10 cannot be resolved at this time:
-  bad group for TESTSUITE/aux-var/0272.exim
-CALLER@r11 cannot be resolved at this time:
-  bad mode (0100644) for TESTSUITE/aux-var/0272.exim: 04 bit(s) unexpected
+CALLER@r1 cannot be resolved at this time: bad owner for TESTSUITE/aux-var/0272.exim
+CALLER@r2 is undeliverable: Explictly Rejected
+CALLER@r3 cannot be resolved at this time: bad owner for TESTSUITE/aux-var/0272.exim
+CALLER@r4 is undeliverable: Explictly Rejected
+CALLER@r5 is undeliverable: Explictly Rejected
+CALLER@r6 cannot be resolved at this time: bad group for TESTSUITE/aux-var/0272.exim
+CALLER@r7 is undeliverable: Explictly Rejected
+CALLER@r8 is undeliverable: Explictly Rejected
+CALLER@r9 is undeliverable: Explictly Rejected
+CALLER@r10 cannot be resolved at this time: bad group for TESTSUITE/aux-var/0272.exim
+CALLER@r11 cannot be resolved at this time: bad mode (0100644) for TESTSUITE/aux-var/0272.exim: 04 bit(s) unexpected

diff --git a/test/stdout/0273 b/test/stdout/0273
index 7b0fc51c80c1cb0c48499ec47781ecf4563c432a..74e77c0e8b802a54ba2bc4a21f71f19d96fa9951 100644 (file)
--- a/test/stdout/0273
+++ b/test/stdout/0273
@@ -2,18 +2,13 @@ userx@r1
   router = r1, transport = t1
 userx@r2
   router = r2, transport = t1
-userx@r3 cannot be resolved at this time:
-  require_files: error for TESTSUITE/aux-var/0273.exim: Permission denied
-userx@r4 cannot be resolved at this time:
-  user "non-existant" for require_files not found
-userx@r5 cannot be resolved at this time:
-  group missing after numerical uid 1 for require_files
+userx@r3 cannot be resolved at this time: require_files: error for TESTSUITE/aux-var/0273.exim: Permission denied
+userx@r4 cannot be resolved at this time: user "non-existant" for require_files not found
+userx@r5 cannot be resolved at this time: group missing after numerical uid 1 for require_files
 userx@r6
   router = r6, transport = t1
-userx@r7 is undeliverable:
-  Unrouteable address
-userx@r8 is undeliverable:
-  Unrouteable address
+userx@r7 is undeliverable: Unrouteable address
+userx@r8 is undeliverable: Unrouteable address
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 <userx@r1> is deliverable\r
 250 <userx@r2> is deliverable\r

diff --git a/test/stdout/0278 b/test/stdout/0278
index 9667c18ac30dc8883b1ff88baa84d0eef6061d87..c3d6616f2e966b3d3402c84a1d33b7a3dfc68e4d 100644 (file)
--- a/test/stdout/0278
+++ b/test/stdout/0278
@@ -1,4 +1,3 @@
 CALLER@test.ex
   router = r3, transport = t1
-unknown@test.ex is undeliverable:
-  Unrouteable address
+unknown@test.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/0279 b/test/stdout/0279
index 295fe2a4b5df7926ffd9976a8de84f434d72fa1c..44981745829639a5bb706b60223a2ddd3e9407b2 100644 (file)
--- a/test/stdout/0279
+++ b/test/stdout/0279
@@ -1,4 +1,3 @@
 CALLER@test.ex
   router = r3, transport = t1
-CALLER@test.ex is undeliverable:
-  matched *@+funny_domains
+CALLER@test.ex is undeliverable: matched *@+funny_domains

diff --git a/test/stdout/0305 b/test/stdout/0305
index 8f4e6ff48294f516153bc6f8a8bc3ca25d00a121..fda4811f525dc83bc8922007f4a6d5f097758cb9 100644 (file)
--- a/test/stdout/0305
+++ b/test/stdout/0305
@@ -9,5 +9,4 @@
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 x@ten-1.test.ex verified
-x@junk.junk failed to verify:
-  Unrouteable address
+x@junk.junk failed to verify: Unrouteable address

diff --git a/test/stdout/0334 b/test/stdout/0334
index a116ac8df4f51aa26120eeff837307ed0489b841..80c4dd9f1efc08340659b7bcaf8c83f04e12a8af 100644 (file)
--- a/test/stdout/0334
+++ b/test/stdout/0334
@@ -1,2 +1 @@
-x@y cannot be resolved at this time:
-  remote host address is the local host
+x@y cannot be resolved at this time: remote host address is the local host

diff --git a/test/stdout/0364 b/test/stdout/0364
index 38b2cf777663841642ad4c765089d0f4d9de3fae..7990d897c76ff92d89ae7c8ee854f50faabf9753 100644 (file)
--- a/test/stdout/0364
+++ b/test/stdout/0364
@@ -1,8 +1,9 @@
 kilos@thishost.test.ex
     <-- kilos@thishost
   router = r5, transport = t2
-solik@otherhost is undeliverable:
-  Can't route to otherhost.sub.test.ex
+solik@otherhost.sub.test.ex is undeliverable: Can't route to otherhost.sub.test.ex
+    <-- solik@otherhost.test.ex
+    <-- solik@otherhost
 xxx@ten-1.test.ex
     <-- xxx@ten-1
   router = r2, transport = t1

diff --git a/test/stdout/0399 b/test/stdout/0399
index ef426f34e66ad346d3351588fb5252ff8f2b7849..75a30947897606cd613549a089d850da2c421533 100644 (file)
--- a/test/stdout/0399
+++ b/test/stdout/0399
@@ -1,2 +1 @@
-x@y cannot be resolved at this time:
-  failed to expand "more" in r3 router: unknown variable name "unknown_variable"
+x@y cannot be resolved at this time: failed to expand "more" in r3 router: unknown variable name "unknown_variable"

diff --git a/test/stdout/0424 b/test/stdout/0424
index 708fa8f69c42bff7c5494d91cceb9d58074e9664..b46f6e1633dcabe2548aca0fce3e9beb0d4761d4 100644 (file)
--- a/test/stdout/0424
+++ b/test/stdout/0424
@@ -1,2 +1 @@
-userx@test.ex is undeliverable:
-  Return_path is: <CALLER@test.ex>
+userx@test.ex is undeliverable: Return_path is: <CALLER@test.ex>

diff --git a/test/stdout/0430 b/test/stdout/0430
index 2277389c4eefcf796bc0bd29763ed300b7433bd9..0d6c72294c4c4b6078e2dde379f94e004990bf97 100644 (file)
--- a/test/stdout/0430
+++ b/test/stdout/0430
@@ -43,17 +43,14 @@ x@random.manual.route
 x@manual.route
   router = r1, transport = t1
   host ten-1.test.ex [V4NET.0.0.1] 
-x@manual.route cannot be resolved at this time:
-  lowest numbered MX record points to local host
+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
   host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5
   host ten-6.test.ex [V4NET.0.0.6]      
-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@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] 

diff --git a/test/stdout/0434 b/test/stdout/0434
index 8805a8c2b1fc435d471be56ed546b4c5b38a3a0e..c438f0e2b5b6f47bab3d854ee8bdcc12fd67c695 100644 (file)
--- a/test/stdout/0434
+++ b/test/stdout/0434
@@ -1,5 +1,4 @@
 a@b
   router = r1, transport = t1
   host 1.2.3.4 [1.2.3.4] 
-a@b cannot be resolved at this time:
-  remote host address is the local host
+a@b cannot be resolved at this time: remote host address is the local host

diff --git a/test/stdout/0467 b/test/stdout/0467
index d9c20263ccf7e1d6a8dda5c76966877d7a94b3fd..553dda850a64d286c90bbe4f3900c7bafe5e085e 100644 (file)
--- a/test/stdout/0467
+++ b/test/stdout/0467
@@ -1,5 +1,4 @@
-x@nosrv.test.ex is undeliverable:
-  Unrouteable address
+x@nosrv.test.ex is undeliverable: Unrouteable address
 x@srv01.test.ex
   router = r1, transport = t1
   host ten-1.test.ex [V4NET.0.0.1] MX=0 port=25
@@ -12,10 +11,8 @@ x@srv02.test.ex
   host ten-1.test.ex [V4NET.0.0.1] MX=1 port=99
   host ten-2.test.ex [V4NET.0.0.2] MX=1 port=99
   host ten-3.test.ex [V4NET.0.0.3] MX=3 port=66
-x@nosmtp.test.ex is undeliverable:
-  an MX or SRV record indicated no SMTP service
-x@srv03.test.ex is undeliverable:
-  Unrouteable address
+x@nosmtp.test.ex is undeliverable: an MX or SRV record indicated no SMTP service
+x@srv03.test.ex is undeliverable: Unrouteable address
 x@srv03.test.ex
   router = r1, transport = t1
   host ten-4.test.ex [V4NET.0.0.4] MX=0 port=88

diff --git a/test/stdout/0469 b/test/stdout/0469
index 18aef036ac456d348ebaea74d25dbf506bfa3b17..73fcad1e66eeb225623ddb1e7c2a3d75c9704c8c 100644 (file)
--- a/test/stdout/0469
+++ b/test/stdout/0469
@@ -1,2 +1 @@
-x@mxt1c.test.ex is undeliverable:
-  all relevant MX records point to non-existent hosts
+x@mxt1c.test.ex is undeliverable: all relevant MX records point to non-existent hosts

diff --git a/test/stdout/1005 b/test/stdout/1005
index fdbda6cc605879da1ce49835d4b21b8aaa7dbefb..43f191d27020235662d37783184be0c853baecaf 100644 (file)
--- a/test/stdout/1005
+++ b/test/stdout/1005
@@ -1,2 +1 @@
-userx@eximtesthost.ipv6.test.ex cannot be resolved at this time:
-  lookup of host "eximtesthost.ipv6.test.ex" failed in lookuphost router
+userx@eximtesthost.ipv6.test.ex cannot be resolved at this time: lookup of host "eximtesthost.ipv6.test.ex" failed in lookuphost router

diff --git a/test/stdout/1006 b/test/stdout/1006
index df65718fe1bf31ac413960ac8439c482031d66f3..08e2a89c5258827a94ea02b723b6f4001a81c6de 100644 (file)
--- a/test/stdout/1006
+++ b/test/stdout/1006
@@ -15,8 +15,7 @@ dnslookup@mx46.test.ex
 manualroute@test.ex
   router = r2, transport = smtp
   host 46.test.ex [V4NET.0.0.4] 
-dnslookup@v6.test.ex is undeliverable:
-  Unrouteable address
+dnslookup@v6.test.ex is undeliverable: Unrouteable address
 Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/2201 b/test/stdout/2201
index 2dedd93921a5048645a96393e0b5bcb9b5e9078c..d50cb5bba4ba8ef3dbf7e9db526dcb6dd537a3e4 100644 (file)
--- a/test/stdout/2201
+++ b/test/stdout/2201
@@ -4,5 +4,4 @@ unknown@test.ex
   router = r2, transport = local_delivery
 test.ex@test.ex
   router = r1, transport = local_delivery
-unknown@test.ex is undeliverable:
-  Unrouteable address
+unknown@test.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/2501 b/test/stdout/2501
index 262dc94aea3ccc36e6bc6702348dbb20b6126db1..1199cdd1d3b13d2c299e84688bdfc477f6771881 100644 (file)
--- a/test/stdout/2501
+++ b/test/stdout/2501
@@ -1,5 +1,4 @@
 xxx@okdomain
   router = r1, transport = t1
-yyy@notokdomain is undeliverable:
-  Unrouteable address
+yyy@notokdomain is undeliverable: Unrouteable address
 syntax error: malformed address: /mod may not follow zzz@dom

diff --git a/test/stdout/3206 b/test/stdout/3206
index 03d607b5aefe38c11ec5a2dad7b695eea5aca238..7652a1265b2d83502e0ccbce73ca37ac98ece3e6 100644 (file)
--- a/test/stdout/3206
+++ b/test/stdout/3206
@@ -1,3 +1,2 @@
 a@test.ex verified
-b@other.domain cannot be resolved at this time:
-  domains check lookup or other defer
+b@other.domain cannot be resolved at this time: domains check lookup or other defer

diff --git a/test/stdout/3210 b/test/stdout/3210
index 38b9c191146973969949d9389a78c160a8fb53ba..b9164d0f2b69a5dbcd905ebb3df921e1c622b00b 100644 (file)
--- a/test/stdout/3210
+++ b/test/stdout/3210
@@ -1,2 +1 @@
-userx@test.ex cannot be resolved at this time:
-  domains check lookup or other defer
+userx@test.ex cannot be resolved at this time: domains check lookup or other defer

diff --git a/test/stdout/4950 b/test/stdout/4950
index 57148e8b4d2912859cf0a34edf74a73f7049ea1b..bd55df45fb7efc5c1d520b0b4df695f842b5a05c 100644 (file)
--- a/test/stdout/4950
+++ b/test/stdout/4950
@@ -11,8 +11,7 @@ userx@ten-1.test.ex
 userx@other1.test.ex
   router = lookuphost, transport = smtp
   host other1.test.ex [V4NET.12.4.5] 
-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 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
   host non-exist.test.ex [unknown] 

diff --git a/test/stdout/5204 b/test/stdout/5204
index 52f9242b96fae20891c14b8900458acee5badbb5..f6b7cbcf4ff87e65b47a7ae9e1e13551182402be 100644 (file)
--- a/test/stdout/5204
+++ b/test/stdout/5204
@@ -1,21 +1,15 @@
-"ACCEPT hosts=localhost lookup=byname"@some.host cannot be resolved at this time:
-  remote host address is the local host
-"DECLINE cannot route this one (DECLINE)"@some.host is undeliverable:
-  Unrouteable address
-"FAIL cannot route this one (FAIL)"@some.host is undeliverable:
-  cannot route this one (FAIL)
-"ERROR cannot route this one (ERROR)"@some.host cannot be resolved at this time:
-  bad command yield: ERROR cannot route this one (ERROR)
-"DEFER cannot route this one (DEFER)"@some.host cannot be resolved at this time:
-  cannot route this one (DEFER)
+"ACCEPT hosts=localhost lookup=byname"@some.host cannot be resolved at this time: remote host address is the local host
+"DECLINE cannot route this one (DECLINE)"@some.host is undeliverable: Unrouteable address
+"FAIL cannot route this one (FAIL)"@some.host is undeliverable: cannot route this one (FAIL)
+"ERROR cannot route this one (ERROR)"@some.host cannot be resolved at this time: bad command yield: ERROR cannot route this one (ERROR)
+"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] 
 PASS@some.host
   router = s, transport = smtp
   host 127.0.0.1 [127.0.0.1] 
-"FREEZE cannot route this one (FREEZE)"@some.host cannot be resolved at this time:
-  cannot route this one (FREEZE)
+"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
   router = pm, transport = null

diff --git a/test/stdout/5205 b/test/stdout/5205
index 8f7bc77dc9e745e80bd000040f5c8b0dbfcccf69..29d84d0f4fc75ee107093fa53bda7b88a0e8fdfb 100644 (file)
--- a/test/stdout/5205
+++ b/test/stdout/5205
@@ -1,2 +1 @@
-userx@ten-3.test.ex cannot be resolved at this time:
-  lookup of host "ten-3.test.ex" failed in queryprogram router
+userx@ten-3.test.ex cannot be resolved at this time: lookup of host "ten-3.test.ex" failed in queryprogram router

diff --git a/test/stdout/5206 b/test/stdout/5206
index 8f7bc77dc9e745e80bd000040f5c8b0dbfcccf69..29d84d0f4fc75ee107093fa53bda7b88a0e8fdfb 100644 (file)
--- a/test/stdout/5206
+++ b/test/stdout/5206
@@ -1,2 +1 @@
-userx@ten-3.test.ex cannot be resolved at this time:
-  lookup of host "ten-3.test.ex" failed in queryprogram router
+userx@ten-3.test.ex cannot be resolved at this time: lookup of host "ten-3.test.ex" failed in queryprogram router

diff --git a/test/stdout/5209 b/test/stdout/5209
index 6c7156e92a3edaf6ac0ae1e3b7512fb3384a597c..bee2ff42dc6cfcc7ecda72afaca3643d2cf7b325 100644 (file)
--- a/test/stdout/5209
+++ b/test/stdout/5209
@@ -1,2 +1 @@
-x@y is undeliverable:
-  67890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C23
+x@y is undeliverable: 67890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C23