Fix mismerge

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

diff --git a/test/scripts/0000-Basic/0576 b/test/scripts/0000-Basic/0576
index becd160569d16f3b024bffdbe47c6d0ee7dea3e8..90d87c927907e35bdf7e1edf691b296cfc163d2e 100644 (file)
--- a/test/scripts/0000-Basic/0576
+++ b/test/scripts/0000-Basic/0576
@@ -4,6 +4,7 @@
 no_msglog_check
 #
 exim -bs
 no_msglog_check
 #
 exim -bs

+HELO test

 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <normal@test.ex>
 DATA
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <normal@test.ex>
 DATA


@@ -44,6 +45,7 @@ exim -DSERVER=server -qGlowpri/3s
 ****
 sleep 1
 exim -bs
 ****
 sleep 1
 exim -bs

+HELO test

 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <lowpri@test.ex>
 DATA
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <lowpri@test.ex>
 DATA


@@ -58,6 +60,7 @@ killdaemon
 #
 # third-party queue transfer
 exim -bs
 #
 # third-party queue transfer
 exim -bs

+HELO test

 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <alternate@test.ex>
 DATA
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <alternate@test.ex>
 DATA


@@ -74,7 +77,9 @@ exim -q
 #
 #
 # Native queue transfer
 #
 #
 # Native queue transfer

+### load messages

 exim -bs
 exim -bs

+HELO test

 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <normal@test.ex>
 DATA
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <normal@test.ex>
 DATA


@@ -92,24 +97,36 @@ foo
 .
 QUIT
 ****
 .
 QUIT
 ****

+### default q

 exim -bp
 ****
 exim -bp
 ****

+### alternate q

 exim -bp -qGalternate
 ****
 #
 exim -bp -qGalternate
 ****
 #

+### move msg from default to third q

 exim -MG third $msg1
 ****
 exim -MG third $msg1
 ****

+### move msg from alternate q to third q

 exim -qGalternate -MG third $msg1
 ****
 exim -qGalternate -MG third $msg1
 ****

+### third q

 exim -bp -qGthird
 ****
 exim -qGthird -MG '' $msg1 $msg2
 ****
 exim -bp -qGthird
 ****
 exim -qGthird -MG '' $msg1 $msg2
 ****

+### default q

 exim -bp
 ****
 exim -bp
 ****

+### alternate q

 exim -bp -qGalternate
 ****
 exim -bp -qGalternate
 ****

+### third q

 exim -bp -qGthird
 ****
 #
 exim -bp -qGthird
 ****
 #

+# Immediate delivery, via alternate queue
+exim -odi q_set_by_nonsmtp_acl@test.ex
+****
+#

 no_stderr_check
 no_stderr_check