DMARC: expand main-config options. Bug 3102

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

diff --git a/test/scripts/0000-Basic/0473 b/test/scripts/0000-Basic/0473
index 4624f5f01902dba17831126fcc826b83b4ffa283..4392c7e33d247a75807cbf577198791614e88f25 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
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -13,7 +13,7 @@ QUIT
 250 OK
 *eof
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -23,7 +23,7 @@ QUIT
 250 OK
 *eof
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 550 NOTOK
@@ -51,7 +51,7 @@ quit
 ****
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -68,7 +68,7 @@ quit
 ****
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -85,7 +85,7 @@ quit
 ****
 server PORT_S
 220 server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -94,6 +94,7 @@ RCPT TO
 QUIT
 250 OK
 ****
+# A rcpt refusal
 exim -bs
 ehlo xxxx
 mail from:<x9@test.ex>
@@ -109,7 +110,7 @@ quit
 ****
 server PORT_S
 220 server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -134,7 +135,7 @@ quit
 ****
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -143,6 +144,7 @@ RCPT TO
 QUIT
 250 OK
 ****
+# an accepted random
 exim -DUSE_SENDER=,defer_ok,random,use_postmaster -bs
 ehlo xxxx
 mail from: x11@two.test.ex
@@ -150,9 +152,44 @@ rcpt to: r11@two.test.ex
 quit
 ****
 dump callout
+# repeat from cache
+exim -DUSE_SENDER=,defer_ok,random,use_postmaster -bs
+ehlo xxxx
+mail from: x11@two.test.ex
+rcpt to: r11@two.test.ex
+quit
+****
+#
+# 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
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK