Testsuite: avoid total fail on DISABLE_EVENT build

[exim.git] / test / scripts / 5600-OCSP-OpenSSL / 5601

diff --git a/test/scripts/5600-OCSP-OpenSSL/5601 b/test/scripts/5600-OCSP-OpenSSL/5601
index 521f8fd7190cee7ba897374d235ab55e7a4fedbc..d6eac7c3d705964e36d5faa17383b7dc811fe13e 100644 (file)
--- a/test/scripts/5600-OCSP-OpenSSL/5601
+++ b/test/scripts/5600-OCSP-OpenSSL/5601
@@ -2,7 +2,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=/dev/null
+exim -bd -oX PORT_D -DSERVER=server -DRETURN=""

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


@@ -15,18 +15,18 @@ killdaemon
 #
 # Client works when we don't request OCSP stapling
 exim -bd -oX PORT_D -DSERVER=server \
 #
 # Client works when we don't request OCSP stapling
 exim -bd -oX PORT_D -DSERVER=server \

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

 ****
 exim nostaple@test.ex
 test message.
 ****
 ****
 exim nostaple@test.ex
 test message.
 ****

-millisleep 500
+millisleep 700

 #
 #
 #
 #
 # Client accepts good stapled info
 #
 #
 #
 #
 # Client accepts good stapled info

-exim CALLER@test.ex
+exim goodstaple@test.ex

 test message.
 ****
 sleep 1
 test message.
 ****
 sleep 1


@@ -35,35 +35,37 @@ 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=/dev/null
+exim -bd -oX PORT_D -DSERVER=server -DRETURN=""

 ****
 ****

-exim CALLER@test.ex
+exim nostaple_required@test.ex

 test message.
 ****
 sleep 1
 killdaemon
 test message.
 ****
 sleep 1
 killdaemon

-no_msglog_check
+sudo rm 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
+ -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp

 ****
 ****

-exim CALLER@test.ex
+exim revoked@test.ex

 test message.
 ****
 sleep 1
 killdaemon
 test message.
 ****
 sleep 1
 killdaemon

+millisleep 200
+sudo rm 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
+ -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp

 ****
 ****

-exim CALLER@test.ex
+exim expired@test.ex

 test message.
 ****
 sleep 1
 test message.
 ****
 sleep 1


@@ -72,3 +74,4 @@ killdaemon
 #
 #
 #
 #
 #
 #

+no_msglog_check