Logging: fix initial listening-on log line

[exim.git] / test / scripts / 5730-OCSP-GnuTLS-events / 5730

diff --git a/test/scripts/5730-OCSP-GnuTLS-events/5730 b/test/scripts/5730-OCSP-GnuTLS-events/5730
index 6085a361ef32b9fc1ea8235a0e8e77ffc0600b3f..11c3a867f80bed6bd82705ef599f961100b98e1a 100644 (file)
--- a/test/scripts/5730-OCSP-GnuTLS-events/5730
+++ b/test/scripts/5730-OCSP-GnuTLS-events/5730
@@ -3,7 +3,7 @@
 #
 #
 # Client works when we request but don't require OCSP stapling and none comes
 #
 #
 # Client works when we request but don't require OCSP stapling and none comes

-exim -bd -oX PORT_D -DSERVER=server -DOCSP=""
+exim -bd -oX PORT_D -DSERVER=server -DOPT=""

 ****
 exim norequire@test.ex
 test message.
 ****
 exim norequire@test.ex
 test message.


@@ -16,12 +16,12 @@ killdaemon
 #
 # Client works when we request but don't require OCSP stapling and some arrives
 exim -bd -oX PORT_D -DSERVER=server \
 #
 # Client works when we request but don't require OCSP stapling and some arrives
 exim -bd -oX PORT_D -DSERVER=server \

- -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
+ -DOPT=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp

 ****
 exim norequire@test.ex
 test message.
 ****
 ****
 exim norequire@test.ex
 test message.
 ****

-millisleep 500
+millisleep 700

 #
 #
 #
 #
 #
 #


@@ -30,7 +30,7 @@ millisleep 500
 exim nostaple@test.ex
 test message.
 ****
 exim nostaple@test.ex
 test message.
 ****

-millisleep 500
+millisleep 700

 #
 #
 #
 #
 #
 #


@@ -45,33 +45,34 @@ killdaemon
 #
 #
 # Client fails on lack of required stapled info
 #
 #
 # Client fails on lack of required stapled info

-exim -bd -oX PORT_D -DSERVER=server -DOCSP=""
+exim -bd -oX PORT_D -DSERVER=server -DOPT=""

 ****
 exim failrequire@test.ex
 test message.
 ****
 sleep 1
 killdaemon
 ****
 exim failrequire@test.ex
 test message.
 ****
 sleep 1
 killdaemon

-no_msglog_check
+sudo rm DIR/spool/db/retry

 #
 #
 #
 # Client fails on revoked stapled info
 EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \
 #
 #
 #
 # Client fails on revoked stapled info
 EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \

- -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
+ -DOPT=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp

 ****
 exim failrevoked@test.ex
 test message.
 ****
 sleep 1
 killdaemon
 ****
 exim failrevoked@test.ex
 test message.
 ****
 sleep 1
 killdaemon

+sudo rm DIR/spool/db/retry

 #
 #
 #
 #
 # Client fails on expired stapled info
 EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \
 #
 #
 #
 #
 # Client fails on expired stapled info
 EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \

- -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
+ -DOPT=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp

 ****
 exim failexpired@test.ex
 test message.
 ****
 exim failexpired@test.ex
 test message.


@@ -82,3 +83,4 @@ killdaemon
 #
 #
 #
 #
 #
 #

+no_msglog_check