Copyright updates

[exim.git] / test / scripts / 5892-Resume-OpenSSL / 5892

diff --git a/test/scripts/5892-Resume-OpenSSL/5892 b/test/scripts/5892-Resume-OpenSSL/5892
index e09fc6398eed32d7da69ba4b45a010030513391a..92eed04d22e53b4977a62b0e06c4eb3ef2e12600 100644 (file)
--- a/test/scripts/5892-Resume-OpenSSL/5892
+++ b/test/scripts/5892-Resume-OpenSSL/5892
@@ -1,24 +1,24 @@
 # TLSv1.2 session resumption
 #
 ### TLS1.2
 # TLSv1.2 session resumption
 #
 ### TLS1.2

-exim -DSERVER=server -DOPTION=+no_tlsv1_3 -bd -oX PORT_D
+exim -DSERVER=server -DOPTION=+no_tlsv1_3 -bd -oX PORT_D:PORT_D2

 ****
 exim -DVALUE=resume -odf getticket@test.ex
 ****
 exim -DVALUE=resume -odf getticket@test.ex

-Test message. Contains FF: ÿ
+Test message.

 ****
 ****

-exim -DVALUE=resume -odf resume@test.ex abcd@test.ex xyz@test.ex
+exim -DVALUE=resume -odf resume@test.ex hostnotresume@test.ex xyz@test.ex

 Test message to two different hosts, one does not support resume
 ****
 # allow time for ticket to hit renewal time
 Test message to two different hosts, one does not support resume
 ****
 # allow time for ticket to hit renewal time

-sleep 3
+sleep 5

 exim -DVALUE=resume -odf renewal@test.ex
 Test message.
 ****
 exim -DVALUE=resume -odf postrenewal@test.ex
 Test message.
 ****
 exim -DVALUE=resume -odf renewal@test.ex
 Test message.
 ****
 exim -DVALUE=resume -odf postrenewal@test.ex
 Test message.
 ****

-sleep 3
-exim -DVALUE=resume -odf timeout@test.ex
+sleep 5
+exim -DVALUE=resume -odf aftertimeout@test.ex

 Test message.
 ****
 exim -odf notreq@test.ex
 Test message.
 ****
 exim -odf notreq@test.ex


@@ -46,6 +46,12 @@ exim -DVALUE=resume -DHELO_MSG=differenthost -odf resume@test.ex
 exim -DVALUE=resume -odf resume@test.ex
 ****
 #
 exim -DVALUE=resume -odf resume@test.ex
 ****
 #

+# Test TLS-on-connect
+exim -DVALUE=resume -DSELECTOR=smtps -odf getticket@test.ex
+****
+exim -DVALUE=resume -DSELECTOR=smtps -odf resume@test.ex
+****
+#

 # Check the -k (key only) option on dumpdb
 perl
 system 'DIR/eximdir/exim_dumpdb -k DIR/spool tls';
 # Check the -k (key only) option on dumpdb
 perl
 system 'DIR/eximdir/exim_dumpdb -k DIR/spool tls';