Testsuite: output changes resulting

[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 b2983eb0d16c1e94d88ccf8aad687e693bc9f76c..ecc763510397df46ac10a4006e936648e386f449 100644 (file)
--- a/test/scripts/5600-OCSP-OpenSSL/5601
+++ b/test/scripts/5600-OCSP-OpenSSL/5601
@@ -1,10 +1,10 @@
 # OCSP stapling, client
 #
 #
 # OCSP stapling, client
 #
 #

-# Client works when we don't demand OCSP stapling
-exim -bd -oX PORT_D -DSERVER=server -DOCSP=/dev/null
+# Client works when we request but don't require OCSP stapling and none comes
+exim -bd -oX PORT_D -DSERVER=server -DRETURN=/dev/null

 ****
 ****

-exim nostaple@test.ex
+exim norequire@test.ex

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


@@ -13,10 +13,19 @@ killdaemon
 #
 #
 #
 #
 #
 #

-# Client accepts good stapled info
+# Client works when we don't request OCSP stapling

 exim -bd -oX PORT_D -DSERVER=server \
 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.

 ****
 ****

+millisleep 700
+#
+#
+#
+#
+# Client accepts good stapled info

 exim CALLER@test.ex
 test message.
 ****
 exim CALLER@test.ex
 test message.
 ****


@@ -25,34 +34,36 @@ killdaemon
 #
 #
 #
 #
 #
 #

-# Client fails on lack of requested stapled info
-exim -bd -oX PORT_D -DSERVER=server -DOCSP=/dev/null
+# Client fails on lack of required stapled info
+exim -bd -oX PORT_D -DSERVER=server -DRETURN=/dev/null

 ****
 exim CALLER@test.ex
 test message.
 ****
 sleep 1
 killdaemon
 ****
 exim CALLER@test.ex
 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
 test message.
 ****
 sleep 1
 killdaemon
 ****
 exim CALLER@test.ex
 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
 test message.
 ****
 exim CALLER@test.ex
 test message.


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

+no_msglog_check