Fix spurious detection of timeout while writing to transport filter

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

diff --git a/test/scripts/5700-events/5700 b/test/scripts/5700-events/5700
index f7cd8272cc2cef08abe6c1e43c08c64e57aa4dde..c6b6e76ff096b57d8c0e75725dbdb3be5f4282d2 100644 (file)
--- a/test/scripts/5700-events/5700
+++ b/test/scripts/5700-events/5700
@@ -1,7 +1,8 @@
 # Arbitrary expansion after transport
-# (EXPERIMENTAL_TPDA)
+# (EXPERIMENTAL_EVENT)
 #
 need_ipv4
+munge timeout_errno
 #
 exim -odq userx@domain1
 A deliverable message
@@ -28,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
@@ -67,6 +68,24 @@ A message which will hit a timeout at the destination server
 #
 #
 exim -odq userx@domain1
+A message which will get deferred
+****
+server PORT_S
+220 ESMTP
+EHLO
+250-OK
+250 HELP
+MAIL
+250 OK
+RCPT
+450 NOT RIGHT NOW
+QUIT
+220 OK
+****
+exim -qqf
+****
+#
+exim -odq userx@domain1
 A message which will get refused
 ****
 server PORT_S
@@ -83,6 +102,28 @@ QUIT
 ****
 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
+****
+#
 #
 #
 #
@@ -92,3 +133,23 @@ A message we will cancel from the queue
 ****
 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
+****