Merge branch 'master' into 4.next

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

diff --git a/test/scripts/0000-Basic/0628 b/test/scripts/0000-Basic/0628
index d227b5acc8062dfff4542c6c737817a4ad5a54fe..1c76f0735d760eb485fa86180e25e7691112bb32 100644 (file)
--- a/test/scripts/0000-Basic/0628
+++ b/test/scripts/0000-Basic/0628
@@ -1,6 +1,7 @@
 # debug logging ACL modifier
 munge debuglog_stdout
 #
 # debug logging ACL modifier
 munge debuglog_stdout
 #

+# Immediate delivery variant

 exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
 #


@@ -11,6 +12,7 @@ EHLO test.ex
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250 
 MAIL FROM:<tester@test.ex>
 ??? 250
 ??? 250 
 MAIL FROM:<tester@test.ex>
 ??? 250


@@ -29,9 +31,44 @@ QUIT
 #
 killdaemon
 #
 #
 killdaemon
 #

+#
+# This time going via a queue-run
+exim -DSERVER=server -DCONTROL=queue_only -bd -oX PORT_D
+****
+client 127.0.0.1 PORT_D
+??? 220
+EHLO test.ex
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250 
+MAIL FROM:<tester2@test.ex>
+??? 250
+RCPT TO:<dest2@test.ex>
+??? 250
+DATA
+??? 354
+Subject: test.
+
+body
+.
+??? 250
+QUIT
+??? 221
+****
+exim -DNOTDAEMON -DSERVER=server -q
+****
+#
+killdaemon
+#
+#
+# This file should have been written, then removed by the debug/kill in rcpt acl

 1
 cat DIR/spool/log/serverdebuglog_1
 #
 1
 cat DIR/spool/log/serverdebuglog_1
 #

-cp DIR/spool/log/serverdebuglog_2 /dev/stderr
+# copy this file to stderr
+cat2 DIR/spool/log/serverdebuglog_2

 #
 no_msglog_check
 #
 no_msglog_check