Fix mismerge

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

diff --git a/test/scripts/0000-Basic/0576 b/test/scripts/0000-Basic/0576
index ddf17f8d9550d9f029948b724bdecfa532629d82..90d87c927907e35bdf7e1edf691b296cfc163d2e 100644 (file)
--- a/test/scripts/0000-Basic/0576
+++ b/test/scripts/0000-Basic/0576
@@ -4,6 +4,7 @@
 no_msglog_check
 #
 exim -bs
+HELO test
 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
+HELO test
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <lowpri@test.ex>
 DATA
@@ -58,6 +60,7 @@ killdaemon
 #
 # third-party queue transfer
 exim -bs
+HELO test
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <alternate@test.ex>
 DATA
@@ -76,6 +79,7 @@ exim -q
 # Native queue transfer
 ### load messages
 exim -bs
+HELO test
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <normal@test.ex>
 DATA
@@ -100,8 +104,10 @@ exim -bp
 exim -bp -qGalternate
 ****
 #
+### move msg from default to third q
 exim -MG third $msg1
 ****
+### move msg from alternate q to third q
 exim -qGalternate -MG third $msg1
 ****
 ### third q
@@ -119,4 +125,8 @@ exim -bp -qGalternate
 exim -bp -qGthird
 ****
 #
+# Immediate delivery, via alternate queue
+exim -odi q_set_by_nonsmtp_acl@test.ex
+****
+#
 no_stderr_check