From cb9d95aeae369ae85cd13473cda0bb3ae415fcb9 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 1 May 2012 20:12:36 +0100 Subject: Fixup testsuite cases affected by dual-tls - mainly EHLO on callouts. --- test/scripts/0000-Basic/0227 | 22 +++++++++++----------- test/scripts/0000-Basic/0376 | 38 +++++++++++++++++++------------------- test/scripts/0000-Basic/0398 | 6 +++--- test/scripts/0000-Basic/0413 | 6 +++--- test/scripts/0000-Basic/0432 | 6 +++--- test/scripts/0000-Basic/0462 | 6 +++--- test/scripts/0000-Basic/0473 | 18 +++++++++--------- test/scripts/0000-Basic/0518 | 16 ++++++++-------- test/scripts/0000-Basic/0540 | 8 ++++---- test/scripts/2100-OpenSSL/2112 | 2 +- test/scripts/5400-cutthrough/5400 | 6 +++--- 11 files changed, 67 insertions(+), 67 deletions(-) (limited to 'test/scripts') diff --git a/test/scripts/0000-Basic/0227 b/test/scripts/0000-Basic/0227 index 62832e012..7b091de4b 100644 --- a/test/scripts/0000-Basic/0227 +++ b/test/scripts/0000-Basic/0227 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -24,7 +24,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -40,7 +40,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -56,7 +56,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 550 Error for <> @@ -70,7 +70,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 550-Multiline error for <> @@ -85,7 +85,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -101,7 +101,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -123,7 +123,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -142,7 +142,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -161,7 +161,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -183,7 +183,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0376 b/test/scripts/0000-Basic/0376 index 7430a6bce..6a819a6ae 100644 --- a/test/scripts/0000-Basic/0376 +++ b/test/scripts/0000-Basic/0376 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -33,7 +33,7 @@ QUIT # Test unsuccessful caching server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -55,7 +55,7 @@ QUIT # Test caching of rejection of MAIL FROM:<> server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 550 REJECT MAIL FROM @@ -75,7 +75,7 @@ QUIT # Test caching of rejection of postmaster server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -103,7 +103,7 @@ QUIT # Test caching of accepting of postmaster server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -131,7 +131,7 @@ QUIT # Test caching of accepting a random address server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -153,7 +153,7 @@ QUIT # Test caching of accepting a random address and postmaster server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -175,7 +175,7 @@ QUIT # Test caching of rejecting a random address and postmaster server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -210,7 +210,7 @@ QUIT # address has to be tested server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -232,7 +232,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -249,7 +249,7 @@ QUIT # Test caching of rejecting a random address server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -271,7 +271,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -289,7 +289,7 @@ QUIT sleep 2 server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -312,7 +312,7 @@ QUIT # Timeout on the RCPT for random server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -327,7 +327,7 @@ QUIT # Postmaster_sender set non-empty server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -350,7 +350,7 @@ QUIT # Header_sender sender set non-empty server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -370,7 +370,7 @@ QUIT # Timeout on RCPT for header_sender (defer_ok test) server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -388,7 +388,7 @@ QUIT # Test full postmaster check server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -413,7 +413,7 @@ QUIT # Test postmaster_mailfrom with random server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0398 b/test/scripts/0000-Basic/0398 index c98016a69..3465e26d6 100644 --- a/test/scripts/0000-Basic/0398 +++ b/test/scripts/0000-Basic/0398 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -22,7 +22,7 @@ quit **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -38,7 +38,7 @@ quit **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0413 b/test/scripts/0000-Basic/0413 index 583ea2ca5..eb805808e 100644 --- a/test/scripts/0000-Basic/0413 +++ b/test/scripts/0000-Basic/0413 @@ -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 250 OK diff --git a/test/scripts/0000-Basic/0432 b/test/scripts/0000-Basic/0432 index 4d9935317..e83626ca3 100644 --- a/test/scripts/0000-Basic/0432 +++ b/test/scripts/0000-Basic/0432 @@ -7,7 +7,7 @@ quit **** server PORT_S 220 server ready -HELO +EHLO 250 OK MAIL 250 OK @@ -30,7 +30,7 @@ quit **** server PORT_S 220 server ready -HELO +EHLO 250 OK MAIL 250 OK @@ -46,7 +46,7 @@ quit # Timeout stuff server PORT_S 220 server ready -HELO +EHLO *sleep 2 *eof **** diff --git a/test/scripts/0000-Basic/0462 b/test/scripts/0000-Basic/0462 index d12ced725..da7b714bf 100644 --- a/test/scripts/0000-Basic/0462 +++ b/test/scripts/0000-Basic/0462 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -27,7 +27,7 @@ QUIT # This one fails the actual address server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -44,7 +44,7 @@ QUIT # Same again, but with sender_verify_fail logging turned off server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0473 b/test/scripts/0000-Basic/0473 index 4624f5f01..3d17e5ed0 100644 --- 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 @@ -109,7 +109,7 @@ quit **** server PORT_S 220 server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -134,7 +134,7 @@ quit **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -152,7 +152,7 @@ quit dump callout server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0518 b/test/scripts/0000-Basic/0518 index 1a6da0129..6b092173c 100644 --- a/test/scripts/0000-Basic/0518 +++ b/test/scripts/0000-Basic/0518 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 8 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -13,7 +13,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -23,7 +23,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -33,7 +33,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -43,7 +43,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -53,7 +53,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -63,7 +63,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -73,7 +73,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0540 b/test/scripts/0000-Basic/0540 index 62bb4fbce..0866eefb9 100644 --- a/test/scripts/0000-Basic/0540 +++ b/test/scripts/0000-Basic/0540 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 4 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -13,7 +13,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -23,7 +23,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -33,7 +33,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK diff --git a/test/scripts/2100-OpenSSL/2112 b/test/scripts/2100-OpenSSL/2112 index 4793929bc..1a39b4ecf 100644 --- a/test/scripts/2100-OpenSSL/2112 +++ b/test/scripts/2100-OpenSSL/2112 @@ -1,5 +1,5 @@ # TLS client: verify certificate from server - fails -exim -DSERVER=server -bd -oX PORT_D +exim -DSERVER=server -d+all -bd -oX PORT_D **** exim userx@test.ex Testing diff --git a/test/scripts/5400-cutthrough/5400 b/test/scripts/5400-cutthrough/5400 index 4aa332b86..843e24b30 100644 --- a/test/scripts/5400-cutthrough/5400 +++ b/test/scripts/5400-cutthrough/5400 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 220 ESMTP -HELO +EHLO 250 OK MAIL FROM: 250 Sender OK @@ -28,7 +28,7 @@ QUIT # cutthrough cancelled by multiple recipients server PORT_S 2 220 ESMTP -HELO +EHLO 250 OK MAIL FROM: 250 Sender OK @@ -55,8 +55,8 @@ QUIT exim -d-all+acl+transport -bs EHLO myhost.test.ex MAIL FROM: -RCPT TO: RCPT TO: +RCPT TO: DATA . -- cgit v1.2.3