diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-06-02 11:58:28 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-06-03 22:04:22 +0100 |
| commit | 087b6b26fa9be49f9ce52bf8941b5a69d1ec31ce (patch) | |
| tree | 28c61a40594834ae3d808e05b2e3ea6ead7f9bb1 /test/scripts/2000-GnuTLS | |
| parent | 8c690dfdc2c09b4aebe32a077c67b41b8ee2a6f0 (diff) | |
Testsuite: stabilize output sequence for 2x35/6
Diffstat (limited to 'test/scripts/2000-GnuTLS')
| -rw-r--r-- | test/scripts/2000-GnuTLS/2035 | 9 | ||||
| -rw-r--r-- | test/scripts/2000-GnuTLS/2036 | 6 | ||||
| -rw-r--r-- | test/scripts/2000-GnuTLS/2037 | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/test/scripts/2000-GnuTLS/2035 b/test/scripts/2000-GnuTLS/2035 index 557a04e0f..94923aa60 100644 --- a/test/scripts/2000-GnuTLS/2035 +++ b/test/scripts/2000-GnuTLS/2035 @@ -6,9 +6,10 @@ need_ipv4 exim -bd -DSERVER=server -oX PORT_D **** # -# a recipient verify and continued-delivery +# A recipient verify and continued-delivery. The debug output should show "already connected to", +# "proxied TLS", and the DATA smtp command only done by the transport process. # cmdline -bs send -exim -bs +exim -d-all+transport -bs mail from:<usera@ok.example> rcpt to:<userb@test.ex> data @@ -18,8 +19,10 @@ body . quit **** -sleep 3 +sleep 1 killdaemon +exim -q +**** # # no_stdout_check diff --git a/test/scripts/2000-GnuTLS/2036 b/test/scripts/2000-GnuTLS/2036 index 76a55e227..cd6e9a121 100644 --- a/test/scripts/2000-GnuTLS/2036 +++ b/test/scripts/2000-GnuTLS/2036 @@ -2,6 +2,7 @@ gnutls need_ipv4 # +# a recipient verify and continued-delivery # smtp send # a tls-capable target for the verify/delivery connection on PORT_D # plus a daemon under test on PORT_S @@ -33,6 +34,8 @@ QUIT **** sleep 3 killdaemon +exim -q +**** # # # smtp send, deliver_drop_priv @@ -64,6 +67,9 @@ QUIT **** sleep 3 killdaemon +exim -q +**** +# # # no_stdout_check diff --git a/test/scripts/2000-GnuTLS/2037 b/test/scripts/2000-GnuTLS/2037 index 37891ad1a..ad13a3f94 100644 --- a/test/scripts/2000-GnuTLS/2037 +++ b/test/scripts/2000-GnuTLS/2037 @@ -6,7 +6,7 @@ exim -bd -DSERVER=server -oX PORT_D **** # cmdline -bs send, rcpt-time defer exim -bs -mail from:<userg@ok.example> +mail from:<> rcpt to:<rcpt_defer@test.ex> quit **** @@ -14,7 +14,7 @@ sleep 3 # # cmdline -bs send, data-time defer exim -bs -mail from:<userh@ok.example> +mail from:<> rcpt to:<data_defer@test.ex> data Subject: test |