diff options
| -rw-r--r-- | test/confs/0099 | 3 | ||||
| -rw-r--r-- | test/log/0099 | 10 | ||||
| -rw-r--r-- | test/msglog/0099.10HmaY-0005vi-00 | 4 | ||||
| -rw-r--r-- | test/stdout/0099 | 14 |
4 files changed, 16 insertions, 15 deletions
diff --git a/test/confs/0099 b/test/confs/0099 index 3f72adb69..4a13b4937 100644 --- 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 40bfaa402..b9bf7cbda 100644 --- 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,10 +8,10 @@ 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 diff --git a/test/msglog/0099.10HmaY-0005vi-00 b/test/msglog/0099.10HmaY-0005vi-00 index 3478d48b2..771300c46 100644 --- 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/stdout/0099 b/test/stdout/0099 index a1b59f986..e473c2b97 100644 --- a/test/stdout/0099 +++ b/test/stdout/0099 @@ -5,21 +5,21 @@ 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: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 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; |