Update tests after reformatting exim -bt message

54 files changed, 137 insertions, 266 deletions

diff --git a/test/stdout/0045 b/test/stdout/0045
index 3f0ffa0bb..5c998117d 100644
--- 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 686ba5cf7..079ba96f5 100644
--- 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 50737244a..ca26171e7 100644
--- 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 306090755..cb1e1b4e5 100644
--- 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

-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 6d8b4a0e5..272e0f224 100644
--- 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 f02de8bc8..20a669707 100644
--- 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 74ab08e62..be52996e8 100644
--- 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 02576912e..0238dbffb 100644
--- 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 4a1f3051b..e05a98818 100644
--- 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 a522b8a2d..9160d1abf 100644
--- 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 648a03433..51c0da7dd 100644
--- 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 9a807d39e..de1944523 100644
--- a/test/stdout/0130
+++ b/test/stdout/0130
@@ -7,5 +7,4 @@
 250 OK

 451 Temporary local problem - please try later

 221 the.local.host.name closing connection

-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 0acddabd8..651b2947d 100644
--- 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 206a430c7..85f095c84 100644
--- 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 93a2bd705..fefcb71e2 100644
--- 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 357aa68c3..219af68d9 100644
--- 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 45a72f4f5..0593ee327 100644
--- 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 9520bb415..d36eb32d8 100644
--- 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 7582da94e..2737f0938 100644
--- 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 496d09c72..cef8628c9 100644
--- 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 2d65891bd..77b589ba5 100644
--- 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 898a92486..6e4305073 100644
--- 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 125382e50..9a949fbb9 100644
--- 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 095a764c8..0efec8954 100644
--- 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 7eaaa387b..2a4439b8c 100644
--- 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 c63771904..3c525af54 100644
--- 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 ef3e9babf..146d027dd 100644
--- 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 6242b232d..5ef33778a 100644
--- 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 c63771904..3c525af54 100644
--- 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 ef3e9babf..146d027dd 100644
--- 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 17f6d2b2a..34ef1591e 100644
--- 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 7b0fc51c8..74e77c0e8 100644
--- 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

 250 <userx@r1> is deliverable

 250 <userx@r2> is deliverable

diff --git a/test/stdout/0278 b/test/stdout/0278
index 9667c18ac..c3d6616f2 100644
--- 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 295fe2a4b..449817458 100644
--- 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 8f4e6ff48..fda4811f5 100644
--- a/test/stdout/0305
+++ b/test/stdout/0305
@@ -9,5 +9,4 @@
 550 Administrative prohibition

 221 myhost.test.ex closing connection

 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 a116ac8df..80c4dd9f1 100644
--- 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 38b2cf777..7990d897c 100644
--- 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 ef426f34e..75a309478 100644
--- 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 708fa8f69..b46f6e163 100644
--- 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 2277389c4..0d6c72294 100644
--- 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 8805a8c2b..c438f0e2b 100644
--- 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 d9c20263c..553dda850 100644
--- 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 18aef036a..73fcad1e6 100644
--- 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 fdbda6cc6..43f191d27 100644
--- 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 df65718fe..08e2a89c5 100644
--- 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 2dedd9392..d50cb5bba 100644
--- 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 262dc94ae..1199cdd1d 100644
--- 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 03d607b5a..7652a1265 100644
--- 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 38b9c1911..b9164d0f2 100644
--- 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 57148e8b4..bd55df45f 100644
--- 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 52f9242b9..f6b7cbcf4 100644
--- 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 8f7bc77dc..29d84d0f4 100644
--- 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 8f7bc77dc..29d84d0f4 100644
--- 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 6c7156e92..bee2ff42d 100644
--- a/test/stdout/5209
+++ b/test/stdout/5209
@@ -1,2 +1 @@
-x@y is undeliverable:
-  67890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C23
+x@y is undeliverable: 67890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C23