Merge branch 'master' into transp_logging_1031

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

diff --git a/test/scripts/5700-deliv-log/5700 b/test/scripts/5700-deliv-log/5700
index 62c7dd24f3cbde14e2ce06ec25d13aae5d00cf36..dccf02ca563016fd4600fa84540b7c69735e03ae 100644 (file)
--- a/test/scripts/5700-deliv-log/5700
+++ b/test/scripts/5700-deliv-log/5700
@@ -4,7 +4,7 @@
 need_ipv4
 #
 exim -odq userx@domain1
 need_ipv4
 #
 exim -odq userx@domain1

-Test message 1
+A deliverable message

 ****
 server PORT_S
 220 ESMTP
 ****
 server PORT_S
 220 ESMTP


@@ -22,5 +22,18 @@ DATA
 QUIT
 220 OK
 ****
 QUIT
 220 OK
 ****

-exim -d+deliver+expand+acl -qqf
+exim -qqf

 ****
 ****

+#
+#
+#
+server PORT_S
+220 ESMTP
+EHLO
+*sleep 4
+****
+exim -odi userx@domain1.com
+A message which will hit a timeout
+.
+****
+