Transactions in retry hintsdb

[exim.git] / test / stdout / 0467

diff --git a/test/stdout/0467 b/test/stdout/0467
index 60ffdae03118ee6aaa348390263a90e48a77b7f8..5b35a366fe5fc88d1704f42f91ce46e34d5e9fa9 100644 (file)
--- a/test/stdout/0467
+++ b/test/stdout/0467
@@ -1,21 +1,18 @@
-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
 x@mx246.test.ex
   router = r1, transport = t1
 x@srv01.test.ex
   router = r1, transport = t1
   host ten-1.test.ex [V4NET.0.0.1] MX=0 port=25
 x@mx246.test.ex
   router = r1, transport = t1

-  host v6.test.ex [unknown] MX=10 ** unusable **

   host ten-1.test.ex [V4NET.0.0.1] MX=10
   host ten-1.test.ex [V4NET.0.0.1] MX=10

+  host v6.test.ex [unknown] MX=10 ** unusable **

 x@srv02.test.ex
   router = r1, transport = t1
   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@srv02.test.ex
   router = r1, transport = t1
   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
 x@srv03.test.ex
   router = r1, transport = t1
   host ten-4.test.ex [V4NET.0.0.4] MX=0 port=88


@@ -35,9 +32,10 @@ DATA
 354 OK
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
 354 OK
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaZ-0005vi-00
-       for x@srv27.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+       id 10HmaZ-000000005vi-0000
+       for x@srv27.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000