[exim-cvs] Testsuite: increase retry time (for really slow t…

Kezdőlap
Ez az üzenet a következő szál része:
Ma teljes szál-fa dátum szerinti rendezve
 
 
Üzenet törlése
Válasz az üzenetre
Szerző: Exim Git Commits Mailing List
Dátum:  
Címzett: exim-cvs
Tárgy: [exim-cvs] Testsuite: increase retry time (for really slow test host)
Gitweb: https://git.exim.org/exim.git/commitdiff/485b86b9dbb99593f752051e936daf8ff0e8add1
Commit:     485b86b9dbb99593f752051e936daf8ff0e8add1
Parent:     54882a4e1152ec5068099515f22ed01bdd3a117c
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Nov 10 20:37:31 2018 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sat Nov 10 20:37:31 2018 +0000


    Testsuite: increase retry time (for really slow test host)
---
 test/confs/0099              |  4 +-
 test/runtest                 |  3 ++
 test/scripts/0000-Basic/0099 |  4 +-
 test/stdout/0099             | 98 ++++++++++++++++++++++----------------------
 4 files changed, 56 insertions(+), 53 deletions(-)


diff --git a/test/confs/0099 b/test/confs/0099
index 8b42991..63a918a 100644
--- 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 df7de0d..f90643c 100755
--- 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 d6655dc..c6df9b7 100644
--- 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 e14fa0a..5c45d7b 100644
--- 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;

Ezt az üzenetet a következő levelezőlistákra küldték el:
exim-cvs
Levelezőlista információk | Közeli üzenetek		<-[exim-cvs] Testsuite: fix testcases for /etc/services not having smtps[exim-cvs] Testsuite: account for hostname-dependent output in debug output->
Tahini and Hummus and Cumin Development Archives adminisztrátora: cumin AdminsLurker (verzió: 2.3)