Testsuite: avoid ipv6 when testing retry data

Some test hosts cannot do ipv6.  We assume that ipv4 is available.

diff --git a/test/confs/0099 b/test/confs/0099
index 3f72adb6948b513dc46a2d7d7e90eeacdeaff5b3..4a13b49375b7ae23541473559eda70351249eeec 100644 (file)
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -15,6 +15,7 @@ gecos_name = CALLER_NAME
 primary_hostname = primary.test.ex
 qualify_domain = test.ex
 retry_data_expire = 2s
+log_selector = +received_recipients
 
 
 # ----- Routers -----
@@ -24,7 +25,7 @@ begin routers
 all:
   driver = manualroute
   route_list = simple  thishost.test.ex  byname \
-            ; complex localhost.test.ex byname \
+            ; complex thisloop.test.ex  byname \
             ; *       127.0.0.1         byname
   self = send
   transport = smtp

diff --git a/test/log/0099 b/test/log/0099
index d2336076bca8efe18b4d6adb78a4961528d35733..952b24041d0d2da7f47b2a186d7e582a8f762c77 100644 (file)
--- a/test/log/0099
+++ b/test/log/0099
@@ -1,4 +1,4 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for userx@simple
 1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@simple R=all T=smtp defer (dd): Connection refused
 1999-03-02 09:44:33 Start queue run: pid=pppp
@@ -8,16 +8,16 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@simple R=all T=smtp defer (dd): Connection refused
 1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 H=localhost.test.ex [::1] Connection refused
-1999-03-02 09:44:33 10HmaY-0005vi-00 H=localhost.test.ex [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for usery@complex
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=thisloop.test.ex [ip4.ip4.ip4.ip4] Connection refused
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=thisloop.test.ex [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@complex R=all T=smtp defer (dd): Connection refused
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for userz@simple
 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=thishost.test.ex [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userz@simple R=all T=smtp defer (dd): Connection refused
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for with@complex
 1999-03-02 09:44:33 10HmbA-0005vi-00 == with@complex R=all T=smtp defer (-53): retry time not reached for any host
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 H=localhost.test.ex [::1] Connection refused
-1999-03-02 09:44:33 10HmbB-0005vi-00 H=localhost.test.ex [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for without@complex
+1999-03-02 09:44:33 10HmbB-0005vi-00 H=thisloop.test.ex [ip4.ip4.ip4.ip4] Connection refused
+1999-03-02 09:44:33 10HmbB-0005vi-00 H=thisloop.test.ex [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmbB-0005vi-00 == without@complex R=all T=smtp defer (dd): Connection refused

diff --git a/test/msglog/0099.10HmaY-0005vi-00 b/test/msglog/0099.10HmaY-0005vi-00
index 3478d48b237d4aa1e48ce5c24cd683a257ef670a..771300c46545be4c66bdc8374f61cf8eab518bbc 100644 (file)
--- a/test/msglog/0099.10HmaY-0005vi-00
+++ b/test/msglog/0099.10HmaY-0005vi-00
@@ -1,4 +1,4 @@
 1999-03-02 09:44:33 Received from CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 H=localhost.test.ex [::1] Connection refused
-1999-03-02 09:44:33 H=localhost.test.ex [127.0.0.1] Connection refused
+1999-03-02 09:44:33 H=thisloop.test.ex [ip4.ip4.ip4.ip4] Connection refused
+1999-03-02 09:44:33 H=thisloop.test.ex [127.0.0.1] Connection refused
 1999-03-02 09:44:33 usery@complex R=all T=smtp defer (dd): Connection refused

diff --git a/test/msglog/0099.10HmbB-0005vi-00 b/test/msglog/0099.10HmbB-0005vi-00
index 6ae1d4b774281e00c2ccc8da8b28f44559618c91..d2e90a6fd9df5b2fae5fbc2ff1554798a1a2fc48 100644 (file)
--- a/test/msglog/0099.10HmbB-0005vi-00
+++ b/test/msglog/0099.10HmbB-0005vi-00
@@ -1,4 +1,4 @@
 1999-03-02 09:44:33 Received from CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 H=localhost.test.ex [::1] Connection refused
-1999-03-02 09:44:33 H=localhost.test.ex [127.0.0.1] Connection refused
+1999-03-02 09:44:33 H=thisloop.test.ex [ip4.ip4.ip4.ip4] Connection refused
+1999-03-02 09:44:33 H=thisloop.test.ex [127.0.0.1] Connection refused
 1999-03-02 09:44:33 without@complex R=all T=smtp defer (dd): Connection refused

diff --git a/test/stdout/0099 b/test/stdout/0099
index 895408af2c511df7f8bccb341f875fec46f6bcac..f31321e349f294aa026a9e2d43a4d16b8871421a 100644 (file)
--- a/test/stdout/0099
+++ b/test/stdout/0099
@@ -5,40 +5,40 @@ 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
-first failed = time last try = time2 next try = time2 + 900
-  T:localhost.test.ex:::1: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:localhost.test.ex:127.0.0.1:999 dd 65 Connection refused
+  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: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:localhost.test.ex:127.0.0.1:999 dd 65 Connection refused
+  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: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:localhost.test.ex:127.0.0.1:999 dd 65 Connection refused
+  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:999 dd 65 Connection refused
 first failed = time last try = time2 next try = time2 + 900
-  T:localhost.test.ex:999 dd 65 Connection refused
+  T:thisloop.test.ex: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: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
 Retry rule: *.star.ex  *  F,3d,10m; 
 Retry rule: lsearch*@;TESTSUITE/aux-fixed/0099.rlist  *  F,1d,3m;