Merge branch 'callout_smtp_tpt_merge'

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

diff --git a/test/scripts/0000-Basic/0211 b/test/scripts/0000-Basic/0211
index ddf99060b104e60a3c917848d9c913d7f23fc849..655b4dd96f077a882da1e43b319ca3d39337b7b7 100644 (file)
--- a/test/scripts/0000-Basic/0211
+++ b/test/scripts/0000-Basic/0211
@@ -1,6 +1,9 @@
 # SMTP connection & EHLO/HELO error responses (+log_sender_on_delivery)
 need_ipv4
+munge optional_dsn_info
 #
+exim -z "Test: temp-rej connect"
+****
 server PORT_S
 450 I'm busy
 QUIT
@@ -9,6 +12,9 @@ QUIT
 exim -odi userx@domain1
 Test message 1
 ****
+#
+exim -z "Test: temp-rej helo"
+****
 server PORT_S
 220 Connected OK
 EHLO
@@ -20,22 +26,52 @@ QUIT
 ****
 exim -qf
 ****
+#
+exim -z "Test: drop conn after banner"
+****
 server PORT_S
-550 Go away
+220 Connected OK
+****
+exim -qf
+****
+#
+exim -z "Test: reject connect"
+****
+server PORT_S
+550 Go away (A)
 QUIT
 250 OK
 ****
 exim -qf
 ****
+#
+exim -z "Test: reject helo"
+****
 server PORT_S
 220 Connected OK
 EHLO
-550 Go away
+550 Go away (B)
 HELO
-550 Go away
+550 Go away (C)
 QUIT
 250 OK
 ****
 exim -odi userx@domain1 usery@domain2
 Test message 2
 ****
+#
+exim -z "Test: reject ehlo, then close (late, giving time for HELO)"
+****
+sudo rm DIR/spool/db/retry
+server PORT_S
+220 Connected OK
+EHLO
+550 You are banned
+HELO
+****
+exim -odi userx@domain1
+Test message 4
+****
+#
+#
+no_msglog_check