Fix mismerge

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

diff --git a/test/scripts/0000-Basic/0609 b/test/scripts/0000-Basic/0609
index 84ab89deddf1531acb6b00250b761bfcc7a17c14..bda2631f5beba3d984ab99d48cfbb29de985fcda 100644 (file)
--- a/test/scripts/0000-Basic/0609
+++ b/test/scripts/0000-Basic/0609
@@ -1,14 +1,18 @@
 # Long ACL delay, truncated
 # Long ACL delay, truncated

-munge debug_pid

 need_ipv4
 #
 # We want the debug note of a truncated delay
 need_ipv4
 #
 # We want the debug note of a truncated delay

+# "delay cancelled by peer close"
+# This is known to fail on MacOS, which lacks the require POLLRDHUP.
+#

 exim -d-all+acl -DSERVER=server -odq -bd -oX PORT_D
 ****
 #
 # Server delays 4s before accepting RCPT
 client 127.0.0.1 PORT_D
 ??? 220
 exim -d-all+acl -DSERVER=server -odq -bd -oX PORT_D
 ****
 #
 # Server delays 4s before accepting RCPT
 client 127.0.0.1 PORT_D
 ??? 220

+helo test
+??? 250

 mail from:<x@y.test.ex>
 ??? 250
 rcpt to:<delay4_accept@y.test.ex>
 mail from:<x@y.test.ex>
 ??? 250
 rcpt to:<delay4_accept@y.test.ex>


@@ -21,6 +25,8 @@ quit
 # but client closes connection
 client 127.0.0.1 PORT_D
 ??? 220
 # but client closes connection
 client 127.0.0.1 PORT_D
 ??? 220

+helo test
+??? 250

 mail from:<x@y.test.ex>
 ??? 250
 rcpt to:<delay4_accept@y.test.ex>
 mail from:<x@y.test.ex>
 ??? 250
 rcpt to:<delay4_accept@y.test.ex>