Queryprogram router: call extract fn directly rather than via string-expansion

[users/heiko/exim.git] / test / scripts / 5700-events / 5700

diff --git a/test/scripts/5700-events/5700 b/test/scripts/5700-events/5700
index 1fe31cbfc3a412343a29c4efc380111f238e638d..c6b6e76ff096b57d8c0e75725dbdb3be5f4282d2 100644 (file)
--- a/test/scripts/5700-events/5700
+++ b/test/scripts/5700-events/5700
@@ -29,7 +29,7 @@ exim -qqf
 #
 #
 #
 #
 #
 #

-exim -odq userx@domain2
+exim -odq userx@expansionfail

 A deliverable message which will hit a coding error in the config
 ****
 server PORT_S
 A deliverable message which will hit a coding error in the config
 ****
 server PORT_S


@@ -102,6 +102,28 @@ QUIT
 ****
 exim -qqf
 ****
 ****
 exim -qqf
 ****

+exim -odq userx@domain1
+A message which will get deferred after data
+****
+server PORT_S
+220 ESMTP
+EHLO
+250-OK
+250 HELP
+MAIL
+250 OK
+RCPT
+250 OK
+DATA
+354
+.
+450 post-data problem
+QUIT
+220 OK
+****
+exim -qqf
+****
+#

 #
 #
 #
 #
 #
 #


@@ -111,3 +133,23 @@ A message we will cancel from the queue
 ****
 exim -odi -Mg $msg1
 ****
 ****
 exim -odi -Mg $msg1
 ****

+#
+#
+#
+#
+exim -odq userx@domain1
+A message we will remove from the queue
+****
+exim -Mrm $msg1
+****
+#
+#
+#
+#
+exim -odq userx@domain1 usery@domain1 userz@domain1
+A message we will remove from the queue that has delivered recipients already.
+****
+exim -Mmd $msg1 usery@domain1
+****
+exim -Mrm $msg1
+****