Use dsn_from for success-DSN messages. Bug 2404

[exim.git] / test / scripts / 5740-OCSP-OpenSSL-events / 5740

diff --git a/test/scripts/5740-OCSP-OpenSSL-events/5740 b/test/scripts/5740-OCSP-OpenSSL-events/5740
index 8010507dc07cd719661f7fbc3f6b590d1aefad37..414430630817bbec4403a53412610b3aa0d0d83c 100644 (file)
--- a/test/scripts/5740-OCSP-OpenSSL-events/5740
+++ b/test/scripts/5740-OCSP-OpenSSL-events/5740
@@ -1,11 +1,11 @@
-# OCSP stapling, client, tpda
+# OCSP stapling, client, events
 # duplicate of 5601
 #
 #
 # 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=/dev/null
 ****
-exim norequire@test.ex
+exim norequire_1@test.ex
 test message.
 ****
 sleep 1
@@ -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 \
- -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 norequire@test.ex
+exim norequire_2@test.ex
 test message.
 ****
-millisleep 500
+millisleep 700
 #
 #
 #
@@ -30,7 +30,7 @@ millisleep 500
 exim nostaple@test.ex
 test message.
 ****
-millisleep 500
+millisleep 700
 #
 #
 #
@@ -45,7 +45,7 @@ killdaemon
 #
 #
 # 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=/dev/null
 ****
 exim failrequire@test.ex
 test message.
@@ -53,25 +53,27 @@ test message.
 sleep 1
 killdaemon
 no_msglog_check
+sudo rm -f DIR/spool/db/retry
 #
 #
 #
 # 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 failrevoked@test.ex
 test message.
 ****
 sleep 1
 killdaemon
+sudo rm -f DIR/spool/db/retry
 #
 #
 #
 #
 # 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 failexpired@test.ex
 test message.