Testsuite: output changes resulting

[exim.git] / test / scripts / 0000-Basic / 0608

diff --git a/test/scripts/0000-Basic/0608 b/test/scripts/0000-Basic/0608
index 1715fd2001fb8752cb4f8b83e2ce05b73635a5e1..a3065d097f4cdd8f4f6bfcda18cddda952d6771e 100644 (file)
--- a/test/scripts/0000-Basic/0608
+++ b/test/scripts/0000-Basic/0608
@@ -1,20 +1,50 @@
-# HELO verify dnssec
-# Exim test configuration 0608
+# bounce_message_file and warn_message_file
 #
-exim -DSERVER=server -bd -oX PORT_D
+exim -odf a@test.ex
+Subject: test 1.1 - Default deny message
 ****
-#
-client 127.0.0.1 PORT_D
-??? 220
-HELO localhost
-??? 250
+exim -odf -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl      b@test.ex
+Subject: test 1.2 - Specified deny message file
+****
+exim -odf -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl    c@test.ex
+Subject: test 1.3 - Specified, missing deny message file
+****
+exim -odf -DOPT=relative_file_path                     d@test.ex
+Subject: test 1.4 - Specified, non-absolute
+****
+exim -odf -DOPT='$acl_m_unset'                         e@test.ex
+Subject: test 1.5 - Specified, expansion empty
+****
+exim -odf -DOPT='DIR/aux-fixed/TESTNUM.$sender_address'        f@test.ex
+Subject: test 1.6 - Specified, expansion tainted
+****
+exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' g@test.ex
+Subject: test 1.7 - Specified, expansion good
 ****
 #
-client 127.0.0.1 PORT_D
-??? 220
-HELO l-sec
-??? 250
+exim -odf delay_p@test.ex
+Subject: test 2.1 - Default delay message
+****
+exim -odf -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl                      delay_q@test.ex
+Subject: test 2.2 - Specified delay message file
 ****
+exim -odf -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl                    delay_r@test.ex
+Subject: test 2.3 - Specified, missing delay message file
+****
+exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' delay_s@test.ex
+Subject: test 2.7 - Specified, expansion good
+****
+# Wait past the delay_warning interval
+sleep 3
+exim -M $msg1
+****
+exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg2
+****
+exim -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl -M $msg3
+****
+exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg4
+****
+#sleep 1
+#
 #
-killdaemon
 no_msglog_check