testsuite: make runtest exit(!0) on failure in continue mode

[users/heiko/exim.git] / test / scripts / 4050-pipe-conn / 4052

diff --git a/test/scripts/4050-pipe-conn/4052 b/test/scripts/4050-pipe-conn/4052
index d41cf812356b70aafb9cc0843826970b54d1a8dc..8ee4947444f71adac7f5b42db119036365e97100 100644 (file)
--- a/test/scripts/4050-pipe-conn/4052
+++ b/test/scripts/4050-pipe-conn/4052
@@ -48,12 +48,12 @@ sudo rm DIR/spool/db/misc
 #
 # Check that the cache is invalidated on SMTP errors from the server for the banner
 #
-server PORT_D 3
+server PORT_D
 >220 banner
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -66,11 +66,16 @@ server PORT_D 3
 <QUIT
 >220 bye
 *eof
+****
+exim -DCONTROL=127.0.0.1 -odi nocache2@test.ex
+body 2
+****
+server PORT_D
 >220 banner
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -83,6 +88,11 @@ server PORT_D 3
 <QUIT
 >220 bye
 *eof
+****
+exim -DCONTROL=127.0.0.1 -odi withcache2@test.ex
+body 2a
+****
+server PORT_D
 *sleep 2
 <EHLO
 <MAIL
@@ -97,18 +107,18 @@ server PORT_D 3
 >>220 bye
 *eof
 ****
-exim -DCONTROL=127.0.0.1 -odi nocache2@test.ex withcache2@test.ex badbanner@test.ex
-body 2
+exim -DCONTROL=127.0.0.1 -odi badbanner@test.ex
+body 2b
 ****
 #
 # Check that the cache is not invalidated on SMTP errors from the server after early-pipelining
 #
-server PORT_D 6
+server PORT_D
 >220 banner
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -121,11 +131,16 @@ server PORT_D 6
 <QUIT
 >220 bye
 *eof
+****
+exim -DCONTROL=127.0.0.1 -odi nocache3@test.ex
+body
+****
+server PORT_D
 >220 banner
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -138,6 +153,11 @@ server PORT_D 6
 <QUIT
 >220 bye
 *eof
+****
+exim -DCONTROL=127.0.0.1 -odi withcache3@test.ex
+body
+****
+server PORT_D
 *sleep 2
 <EHLO
 <MAIL
@@ -146,7 +166,7 @@ server PORT_D 6
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 >250 mail good
 >250 rcpt good
@@ -154,6 +174,11 @@ server PORT_D 6
 <QUIT
 >>220 bye
 *eof
+****
+exim -DCONTROL=127.0.0.1 -odi baddata3@test.ex
+body
+****
+server PORT_D
 *sleep 2
 <EHLO
 <MAIL
@@ -162,7 +187,7 @@ server PORT_D 6
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 >250 mail good
 >550 rcpt refused
@@ -170,6 +195,11 @@ server PORT_D 6
 <QUIT
 >>220 bye
 *eof
+****
+exim -DCONTROL=127.0.0.1 -odi badrcpt3@test.ex
+body
+****
+server PORT_D
 *sleep 2
 <EHLO
 <MAIL
@@ -178,7 +208,7 @@ server PORT_D 6
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 >550 mail cmd refused
 >550 rcpt cmd rejected - no valid mail
@@ -186,12 +216,17 @@ server PORT_D 6
 <QUIT
 >>220 bye
 *eof
+****
+exim -DCONTROL=127.0.0.1 -odi badmail3@test.ex
+body
+****
+server PORT_D
 *sleep 2
 >220 banner
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -205,7 +240,7 @@ server PORT_D 6
 >220 bye
 *eof
 ****
-exim -DCONTROL=127.0.0.1 -odi nocache@test.ex withcache@test.ex baddata@test.ex badrcpt@test.ex badmail@test.ex withcache2@test.ex
+exim -DCONTROL=127.0.0.1 -odi withcache23@test.ex
 body
 ****
 #
@@ -215,13 +250,16 @@ body
 # but it's the DB dump that matters.  Unfortunately the dump doesn't show
 # us the (binary) record content, only the key.  So you need to look at the
 # debug output after all.
+# This server offers SIZE where the previous did not; we should see in
+# test-stderr a line "EHLO cleartext extensions changed" then another
+# "writing clr 0160/0000 cry 0000/0000"
 server PORT_D 1
 >220 banner
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
->250-STARTTLS
+>250-PIPE_CONNECT
+>250-SIZE
 >250 ok
 <MAIL
 >250 mail-from accepted