From: Jeremy Harris Date: Wed, 17 May 2017 22:19:43 +0000 (+0100) Subject: Testsuite: delays in 2x3[567] X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/16b33efd9367c4f0a2560b2facd50797fd17a2b6 Testsuite: delays in 2x3[567] --- diff --git a/test/log/2035 b/test/log/2035 index 13c6c838e..5d7edb1d0 100644 --- a/test/log/2035 +++ b/test/log/2035 @@ -1,11 +1,11 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 received on port 0 +1999-03-02 09:44:33 10HmaX-0005vi-00 received on port 0 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for userb@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaY-0005vi-00 10HmaY-0005vi-00 received on port 1225 +1999-03-02 09:44:33 10HmaY-0005vi-00 received on port 1225 1999-03-02 09:44:33 10HmaY-0005vi-00 <= usera@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userb@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=target 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/2036 b/test/log/2036 index 8cd59048c..17125939d 100644 --- a/test/log/2036 +++ b/test/log/2036 @@ -7,6 +7,8 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userc@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss for userd@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => userd@test.ex R=dut T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=target +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1224 1999-03-02 09:44:33 10HmaZ-0005vi-00 received on port 1224 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= usere@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userf@test.ex @@ -14,5 +16,3 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 <= usere@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss for userf@test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userf@test.ex R=dut T=t1 H=127.0.0.1 [127.0.0.1]:1225 C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=target -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/2037 b/test/log/2037 index 896dcf6f8..4ca37620f 100644 --- a/test/log/2037 +++ b/test/log/2037 @@ -1,10 +1,10 @@ 1999-03-02 09:44:33 U=CALLER F= temporarily rejected RCPT : Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:: 451 Temporary local problem - please try later -1999-03-02 09:44:33 10HmaY-0005vi-00 10HmaY-0005vi-00 received on port 0 +1999-03-02 09:44:33 10HmaY-0005vi-00 received on port 0 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for data_defer@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 == data_defer@test.ex R=client T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]:1111: SMTP error from remote mail server after end of data: 451 Temporary local problem - please try later ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F= temporarily rejected RCPT -1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 received on port 1225 +1999-03-02 09:44:33 10HmaX-0005vi-00 received on port 1225 1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F= temporarily rejected after DATA diff --git a/test/log/2135 b/test/log/2135 index d2a01cd23..daade7dd3 100644 --- a/test/log/2135 +++ b/test/log/2135 @@ -1,11 +1,11 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 received on port 0 +1999-03-02 09:44:33 10HmaX-0005vi-00 received on port 0 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for userb@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaY-0005vi-00 10HmaY-0005vi-00 received on port 1225 +1999-03-02 09:44:33 10HmaY-0005vi-00 received on port 1225 1999-03-02 09:44:33 10HmaY-0005vi-00 <= usera@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userb@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=target 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/2137 b/test/log/2137 index bef7dce9d..5d0436069 100644 --- a/test/log/2137 +++ b/test/log/2137 @@ -1,10 +1,10 @@ 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT : Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:: 451 Temporary local problem - please try later -1999-03-02 09:44:33 10HmaY-0005vi-00 10HmaY-0005vi-00 received on port 0 +1999-03-02 09:44:33 10HmaY-0005vi-00 received on port 0 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for data_defer@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 == data_defer@test.ex R=client T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]:1111: SMTP error from remote mail server after end of data: 451 Temporary local problem - please try later ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> temporarily rejected RCPT -1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 received on port 1225 +1999-03-02 09:44:33 10HmaX-0005vi-00 received on port 1225 1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> temporarily rejected after DATA diff --git a/test/scripts/2000-GnuTLS/2035 b/test/scripts/2000-GnuTLS/2035 index cb227868c..557a04e0f 100644 --- a/test/scripts/2000-GnuTLS/2035 +++ b/test/scripts/2000-GnuTLS/2035 @@ -18,7 +18,7 @@ body . quit **** -sleep 1 +sleep 3 killdaemon # # diff --git a/test/scripts/2000-GnuTLS/2036 b/test/scripts/2000-GnuTLS/2036 index 1891d2fe8..76a55e227 100644 --- a/test/scripts/2000-GnuTLS/2036 +++ b/test/scripts/2000-GnuTLS/2036 @@ -31,7 +31,7 @@ body QUIT ??? 221 **** -sleep 1 +sleep 3 killdaemon # # @@ -62,7 +62,7 @@ body QUIT ??? 221 **** -sleep 1 +sleep 3 killdaemon # # diff --git a/test/scripts/2000-GnuTLS/2037 b/test/scripts/2000-GnuTLS/2037 index 8dca68114..37891ad1a 100644 --- a/test/scripts/2000-GnuTLS/2037 +++ b/test/scripts/2000-GnuTLS/2037 @@ -10,7 +10,7 @@ mail from: rcpt to: quit **** -sleep 1 +sleep 3 # # cmdline -bs send, data-time defer exim -bs @@ -23,7 +23,7 @@ body . quit **** -sleep 1 +sleep 3 killdaemon # # diff --git a/test/scripts/2100-OpenSSL/2135 b/test/scripts/2100-OpenSSL/2135 index 5f8ee7d86..1f760e4ef 100644 --- a/test/scripts/2100-OpenSSL/2135 +++ b/test/scripts/2100-OpenSSL/2135 @@ -17,7 +17,7 @@ body . quit **** -sleep 2 +sleep 3 killdaemon # # diff --git a/test/scripts/2100-OpenSSL/2136 b/test/scripts/2100-OpenSSL/2136 index 0eb18ffa9..c18cf946c 100644 --- a/test/scripts/2100-OpenSSL/2136 +++ b/test/scripts/2100-OpenSSL/2136 @@ -31,7 +31,7 @@ body QUIT ??? 221 **** -sleep 2 +sleep 3 killdaemon # # @@ -62,7 +62,7 @@ body QUIT ??? 221 **** -sleep 2 +sleep 3 killdaemon # # diff --git a/test/scripts/2100-OpenSSL/2137 b/test/scripts/2100-OpenSSL/2137 index ec9a964a2..36c36fe11 100644 --- a/test/scripts/2100-OpenSSL/2137 +++ b/test/scripts/2100-OpenSSL/2137 @@ -9,7 +9,7 @@ mail from:<> rcpt to: quit **** -sleep 1 +sleep 3 # # cmdline -bs send, data-time defer exim -bs @@ -22,7 +22,7 @@ body . quit **** -sleep 1 +sleep 3 killdaemon # #