When trying spooled messages, account for the local-interface in grouping for a conne...

[users/jgh/exim.git] / test / stdout / 1006

diff --git a/test/stdout/1006 b/test/stdout/1006
index 98fab55b41d77da4a190a00019fc3125e15976f9..87903f4ea711d439a94a9a28c39a4cc0298cabd1 100644 (file)
--- a/test/stdout/1006
+++ b/test/stdout/1006
@@ -1,11 +1,11 @@
 dnslookup@mx46.test.ex
   router = r1, transport = smtp
 dnslookup@mx46.test.ex
   router = r1, transport = smtp

-  host 46.test.ex [V4NET.0.0.4] MX=46

   host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46
   host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46

+  host 46.test.ex [V4NET.0.0.4] MX=46

 manualroute@test.ex
   router = r2, transport = smtp
   host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] 
 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 [V4NET.0.0.4] 

 dnslookup@v6.test.ex
   router = r1, transport = smtp
   host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] 
 dnslookup@v6.test.ex
   router = r1, transport = smtp
   host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] 


@@ -15,8 +15,7 @@ dnslookup@mx46.test.ex
 manualroute@test.ex
   router = r2, transport = smtp
   host 46.test.ex [V4NET.0.0.4] 
 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
 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


@@ -24,4 +23,4 @@ Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script

-Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... failed: Connection refused
+Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connect failed: Connection refused