Make {bounce,warn}_message_file expanded. Bug 2522

[exim.git] / test / stdout / 0099

diff --git a/test/stdout/0099 b/test/stdout/0099
index 2cb1e2437e193bd4ff1bcf3152261a8af5713dec..5c45d7b3094d6bf1d4a2134f1b49446b1e481478 100644 (file)
--- a/test/stdout/0099
+++ b/test/stdout/0099
@@ -1,15 +1,65 @@
 +++++++++++++++++++++++++++
-  T:127.0.0.1:127.0.0.1:999 dd 65 Connection refused
-first failed = time last try = time2 next try = time2 + 60
+  T:thishost.test.ex:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
 +++++++++++++++++++++++++++
-  T:127.0.0.1:127.0.0.1:999 dd 65 Connection refused
-first failed = time last try = time2 next try = time2 + 60
+  T:thishost.test.ex:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
 +++++++++++++++++++++++++++
-  T:127.0.0.1:127.0.0.1:999 dd 65 Connection refused
-first failed = time last try = time2 next try = time2 + 60
+  T:thishost.test.ex:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thisloop.test.ex:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thisloop.test.ex:ip4.ip4.ip4.ip4:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
++++++++++++++++++++++++++++
+  T:thishost.test.ex:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thishost.test.ex:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thisloop.test.ex:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thisloop.test.ex:ip4.ip4.ip4.ip4:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
++++++++++++++++++++++++++++
+  T:thishost.test.ex:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thishost.test.ex:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thisloop.test.ex:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thisloop.test.ex:ip4.ip4.ip4.ip4:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
++++++++++++++++++++++++++++
+  T:thishost.test.ex:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thishost.test.ex:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thisloop.test.ex:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thisloop.test.ex:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thisloop.test.ex:ip4.ip4.ip4.ip4:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
++++++++++++++++++++++++++++
+  R:mxnonexist.test.ex -1 0 missing MX, or all MXs point to missing A records, and defer requested
+first failed = time last try = time2 next try = time2 + 1200
+  R:mxt2.test.ex -1 0 missing MX, or all MXs point to missing A records, and defer requested
+first failed = time last try = time2 next try = time2 + 1200
+  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:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thishost.test.ex:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thisloop.test.ex:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thisloop.test.ex:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
+  T:thisloop.test.ex:ip4.ip4.ip4.ip4:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
 Retry rule: *.star.ex  *  F,3d,10m; 
 Retry rule: lsearch*@;TESTSUITE/aux-fixed/0099.rlist  *  F,1d,3m; 
-Retry rule: *  *  F,2d,15m; 
+Retry rule: !*.not.ex  *  F,2d,20m; 
 Retry rule: *@\N^\d  *  F,5d,1m; 
 Retry rule: *@*.abcd.ex  *  F,5d,2m; 
 Retry rule: *@literal.ex  *  F,5d,3m; 
@@ -21,3 +71,5 @@ Retry rule: rcpt45x.test.ex  *  F,1w3d,2m;
 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;