appendfile: tidying

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

diff --git a/test/scripts/0000-Basic/0211 b/test/scripts/0000-Basic/0211
index f8750d2e84e55413e62c06b111faa57457d67a36..c27a7ebf3554342ce0c9ae19c362d95e5c6ddb66 100644 (file)
--- a/test/scripts/0000-Basic/0211
+++ b/test/scripts/0000-Basic/0211
@@ -13,6 +13,7 @@ exim -odi userx@domain1
 Test message 1
 ****
 #
 Test message 1
 ****
 #

+sudo rm DIR/spool/db/*

 exim -z "Test: temp-rej helo"
 ****
 server PORT_S
 exim -z "Test: temp-rej helo"
 ****
 server PORT_S


@@ -27,6 +28,7 @@ QUIT
 exim -qf
 ****
 #
 exim -qf
 ****
 #

+sudo rm DIR/spool/db/*

 exim -z "Test: drop conn after banner"
 ****
 server PORT_S
 exim -z "Test: drop conn after banner"
 ****
 server PORT_S


@@ -35,27 +37,60 @@ server PORT_S
 exim -qf
 ****
 #
 exim -qf
 ****
 #

+sudo rm DIR/spool/db/*

 exim -z "Test: reject connect"
 ****
 server PORT_S
 exim -z "Test: reject connect"
 ****
 server PORT_S

-550 Go away
+550 Go away (A)

 QUIT
 250 OK
 ****
 exim -qf
 ****
 #
 QUIT
 250 OK
 ****
 exim -qf
 ****
 #

+sudo rm DIR/spool/db/*

 exim -z "Test: reject helo"
 ****
 server PORT_S
 220 Connected OK
 EHLO
 exim -z "Test: reject helo"
 ****
 server PORT_S
 220 Connected OK
 EHLO

-550 Go away
+550 Go away (B)

 HELO
 HELO

-550 Go away
+550 Go away (C)

 QUIT
 250 OK
 ****
 exim -odi userx@domain1 usery@domain2
 Test message 2
 ****
 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
+****
+#
+#
+#
+sudo rm DIR/spool/db/*
+exim -z "Test: smtp-reject conn on 1MX, timeout TCP conn on 2MX"
+****
+server PORT_S 2
+554 no smtp service here
+QUIT
+220 bye
+*eof
+*sleep 2
+****
+exim -DLIST -qf
+****
+#
+#
+no_msglog_check