Cutthrough: handle request when a callout-hold is active. Bug 2604

[users/heiko/exim.git] / test / scripts / 0000-Basic / 0473

diff --git a/test/scripts/0000-Basic/0473 b/test/scripts/0000-Basic/0473
index 4624f5f01902dba17831126fcc826b83b4ffa283..df613c4b7ca53378be2f7e95b8de370fc5524a94 100644 (file)
--- a/test/scripts/0000-Basic/0473
+++ b/test/scripts/0000-Basic/0473
@@ -3,7 +3,7 @@ need_ipv4
 #
 server PORT_S 3
 220 Server ready
 #
 server PORT_S 3
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -13,7 +13,7 @@ QUIT
 250 OK
 *eof
 220 Server ready
 250 OK
 *eof
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -23,7 +23,7 @@ QUIT
 250 OK
 *eof
 220 Server ready
 250 OK
 *eof
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 550 NOTOK
 250 OK
 MAIL FROM
 550 NOTOK


@@ -51,7 +51,7 @@ quit
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -68,7 +68,7 @@ quit
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -85,7 +85,7 @@ quit
 ****
 server PORT_S
 220 server ready
 ****
 server PORT_S
 220 server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -109,7 +109,7 @@ quit
 ****
 server PORT_S
 220 server ready
 ****
 server PORT_S
 220 server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -134,7 +134,7 @@ quit
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -150,9 +150,37 @@ rcpt to: r11@two.test.ex
 quit
 ****
 dump callout
 quit
 ****
 dump callout

+#
+# callout target dumps after random-reject
+server PORT_S 2
+220 Server ready
+EHLO
+250 OK
+MAIL FROM
+250 OK
+RCPT TO
+550 Bad receipient, dropping conn
+>*eof
+220 Server ready
+EHLO
+250 OK
+MAIL FROM
+250 OK
+RCPT TO
+250 OK
+QUIT
+250 OK
+****
+exim -DUSE_SENDER=,random -bs
+ehlo xxxx
+mail from: x12@three.test.ex
+rcpt to: r12@three.test.ex
+quit
+****
+dump callout

 server PORT_S
 220 Server ready
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK