Handle expansion fails in router "set" options. Bug 3058

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

diff --git a/test/scripts/0000-Basic/0576 b/test/scripts/0000-Basic/0576
index dedc73d2337fd89100ad6ce13b3890b635a45603..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
@@ -72,4 +75,58 @@ sudo mv DIR/spool/alternate/input/* DIR/spool/input/
 exim -q
 ****
 #
+#
+# Native queue transfer
+### load messages
+exim -bs
+HELO test
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO: <normal@test.ex>
+DATA
+Subject: test
+
+foo
+.
+RSET
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO: <alternate@test.ex>
+DATA
+Subject: test
+
+foo
+.
+QUIT
+****
+### default q
+exim -bp
+****
+### alternate q
+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
+exim -bp -qGthird
+****
+exim -qGthird -MG '' $msg1 $msg2
+****
+### default q
+exim -bp
+****
+### alternate q
+exim -bp -qGalternate
+****
+### third q
+exim -bp -qGthird
+****
+#
+# Immediate delivery, via alternate queue
+exim -odi q_set_by_nonsmtp_acl@test.ex
+****
+#
 no_stderr_check