Restore expansion of "inlist" RHS

[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 7a870425f8f36a7068565a9c13441ee6f204152b..d6eac7c3d705964e36d5faa17383b7dc811fe13e 100644 (file)
--- a/test/scripts/5600-OCSP-OpenSSL/5601
+++ b/test/scripts/5600-OCSP-OpenSSL/5601
@@ -26,7 +26,7 @@ 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


@@ -37,12 +37,12 @@ killdaemon
 # Client fails on lack of required stapled info
 exim -bd -oX PORT_D -DSERVER=server -DRETURN=""
 ****
 # Client fails on lack of required stapled info
 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

-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_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
 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_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
 test message.
 ****
 sleep 1