Merge branch 'master'

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

diff --git a/test/stdout/0099 b/test/stdout/0099
index e9272baa6eb29dc53c14188bca67f3015e40c720..0f6f7f2faa078cfa4881c29b649766703f2fbf90 100644 (file)
--- a/test/stdout/0099
+++ b/test/stdout/0099
@@ -5,20 +5,55 @@ first failed = time last try = time2 next try = time2 + 900
   T:thishost.test.ex:127.0.0.1:999 dd 65 Connection refused
 first failed = time last try = time2 next try = time2 + 900
 +++++++++++++++++++++++++++
-  T:localhost.test.ex:127.0.0.1:999 dd 65 Connection refused
+  T:thishost.test.ex:127.0.0.1:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thisloop.test.ex:127.0.0.1:999 dd 65 Connection refused
 first failed = time last try = time2 next try = time2 + 900
-  T:localhost.test.ex:::1:999 dd 65 Connection refused
+  T:thisloop.test.ex:ip4.ip4.ip4.ip4:999 dd 65 Connection refused
 first failed = time last try = time2 next try = time2 + 900
++++++++++++++++++++++++++++
   T:thishost.test.ex:127.0.0.1:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thishost.test.ex:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thisloop.test.ex:127.0.0.1:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thisloop.test.ex:ip4.ip4.ip4.ip4:999 dd 65 Connection refused
 first failed = time last try = time2 next try = time2 + 900
 +++++++++++++++++++++++++++
-  T:localhost.test.ex:127.0.0.1:999 dd 65 Connection refused
+  T:thishost.test.ex:127.0.0.1:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thishost.test.ex:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thisloop.test.ex:127.0.0.1:999 dd 65 Connection refused
 first failed = time last try = time2 next try = time2 + 900
-  T:localhost.test.ex:::1:999 dd 65 Connection refused
+  T:thisloop.test.ex:ip4.ip4.ip4.ip4:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
++++++++++++++++++++++++++++
+  T:thishost.test.ex:127.0.0.1:999 dd 65 Connection refused
 first failed = time last try = time2 next try = time2 + 900
   T:thishost.test.ex:999 dd 65 Connection refused
 first failed = time last try = time2 next try = time2 + 900
+  T:thisloop.test.ex:127.0.0.1:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thisloop.test.ex:ip4.ip4.ip4.ip4:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thisloop.test.ex:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
++++++++++++++++++++++++++++
+  R:mxt2.test.ex -32 0 all relevant MX records point to non-existent hosts
+first failed = time last try = time2 next try = time2 + 1800
+  R:nonexist -32 0 lookup of host "nonexist.test.ex" failed in all router
+first failed = time last try = time2 next try = time2 + 1800
   T:thishost.test.ex:127.0.0.1:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thishost.test.ex:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thisloop.test.ex:127.0.0.1:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thisloop.test.ex:ip4.ip4.ip4.ip4:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thisloop.test.ex:999 dd 65 Connection refused
 first failed = time last try = time2 next try = time2 + 900
 Retry rule: *.star.ex  *  F,3d,10m; 
 Retry rule: lsearch*@;TESTSUITE/aux-fixed/0099.rlist  *  F,1d,3m; 
@@ -35,3 +70,4 @@ Retry rule: rcpt463.test.ex  *  F,1w3d,3m;
 Retry rule: *  *  G,1d,1m,1.5; 
 Retry rule: *  *  G,2d,2m,1.5; 
 Retry rule: *  *  F,1w5d,2h30m; 
+Retry rule: *  *  F,1w3d,30m;