Testsuite: increase retry time (for really slow test host)

diff --git a/test/confs/0099 b/test/confs/0099
index 8b4299130b65253f594e54dd769b628ccf08de86..63a918a0f5fd846f604c921db17941849d0d54e3 100644 (file)
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -40,7 +40,7 @@ begin transports
 
 smtp:
   driver = smtp
-  port = 999
+  port = PORT_N
   RETRY
 
 
@@ -64,7 +64,7 @@ rcpt4xx.test.ex              rcpt_4xx      F,10d,1m
 *@@                          *             F,5d,6m
 lsearch*@;DIR/aux-fixed/TESTNUM.rlist  *             F,1d,3m
 *.star.ex                    *             F,3d,10m
-!*.not.ex                    *             F,2d,15m
+!*.not.ex                    *             F,2d,20m
 *                            *             F,12d,150m
 
 # End

diff --git a/test/runtest b/test/runtest
index df7de0d9a079e2283bd751104981fad04ebc6de4..f90643ca6ace6b1684dba5b532b7d563f271dd66 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -476,6 +476,9 @@ RESET_AFTER_EXTRA_LINE_READ:
   # more_errno values in exim_dumpdb output which are times
   s/T:(\S+)\s-22\s(\S+)\s/T:$1 -22 xxxx /;
 
+  # port numbers
+  s/T:([a-z.]+(:[0-9.]+)?):$parm_port_n /T:$1:PORT_N /;
+
 
   # ======== Dates and times ========
 

diff --git a/test/scripts/0000-Basic/0099 b/test/scripts/0000-Basic/0099
index d6655dcf9deb8b7decf51cf15d7f091a4eef53f0..c6df9b7ddcb2d066ec374e5f1f9032ebf431913f 100644 (file)
--- a/test/scripts/0000-Basic/0099
+++ b/test/scripts/0000-Basic/0099
@@ -14,7 +14,7 @@ sleep 3
 exim -odi -q
 ****
 #
-# This should add two entries for "localhost.test.ex" (ipv4, ipv6)
+# This should add two entries for "thisloop.test.ex" (ip4, 127.0.0.1)
 exim -odi usery@complex
 Test message 2
 ****
@@ -32,7 +32,7 @@ Test message
 ****
 dump retry
 #
-# expanded option, giving false, should add another localhost entry, without IP
+# expanded option, giving false, should add another 'thisloop.test.ex' entry, without IP
 exim -odi -DRETRY='retry_include_ip_address=${if eq{with}{$local_part} {yes}{no}}' without@complex
 Test message
 ****

diff --git a/test/stdout/0099 b/test/stdout/0099
index e14fa0a3513fe46ed37682e7a0fff6cd284ebd5b..5c45d7b3094d6bf1d4a2134f1b49446b1e481478 100644 (file)
--- a/test/stdout/0099
+++ b/test/stdout/0099
@@ -1,65 +1,65 @@
 +++++++++++++++++++++++++++
-  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:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
 +++++++++++++++++++++++++++
-  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:127.0.0.1:PORT_N dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 1200
 +++++++++++++++++++++++++++
-  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: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: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: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: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: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: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: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
+  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 + 900
+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 + 900
+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: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
+  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: !*.not.ex  *  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;