X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d5b80e59458182b2d557a929a18cb8c70cd56b68..af8a610f0b90ae66f32b7c6ec31381bdd8457b59:/test/scripts/5600-OCSP-OpenSSL/5601

diff --git a/test/scripts/5600-OCSP-OpenSSL/5601 b/test/scripts/5600-OCSP-OpenSSL/5601
index ecc763510..d6eac7c3d 100644
--- 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
-exim -bd -oX PORT_D -DSERVER=server -DRETURN=/dev/null
+exim -bd -oX PORT_D -DSERVER=server -DRETURN=""
 ****
 exim norequire@test.ex
 test message.
@@ -26,7 +26,7 @@ millisleep 700
 #
 #
 # Client accepts good stapled info
-exim CALLER@test.ex
+exim goodstaple@test.ex
 test message.
 ****
 sleep 1
@@ -35,14 +35,14 @@ killdaemon
 #
 #
 # Client fails on lack of required stapled info
-exim -bd -oX PORT_D -DSERVER=server -DRETURN=/dev/null
+exim -bd -oX PORT_D -DSERVER=server -DRETURN=""
 ****
-exim CALLER@test.ex
+exim nostaple_required@test.ex
 test message.
 ****
 sleep 1
 killdaemon
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
 #
 #
 #
@@ -50,13 +50,13 @@ sudo rm spool/db/retry
 EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \
  -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
 millisleep 200
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
 #
 #
 #
@@ -65,7 +65,7 @@ sudo rm spool/db/retry
 EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \
  -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