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/stderr/0376 | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) (limited to 'test/stderr/0376') diff --git a/test/stderr/0376 b/test/stderr/0376 index 3a6367578..857295978 100644 --- a/test/stderr/0376 +++ b/test/stderr/0376 @@ -14,7 +14,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -83,7 +83,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -137,7 +137,7 @@ callout cache: address record expired interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 550 REJECT MAIL FROM @@ -187,12 +187,13 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -246,12 +247,13 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -299,7 +301,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -343,7 +345,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -387,7 +389,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -399,6 +401,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -447,12 +450,13 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -483,7 +487,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -512,7 +516,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -548,7 +552,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -577,7 +581,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -612,7 +616,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -643,12 +647,13 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM: @@ -679,7 +684,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM: SMTP<< 250 OK @@ -711,7 +716,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -740,12 +745,13 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -777,7 +783,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM: SMTP<< 250 OK @@ -789,6 +795,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM: -- cgit v1.2.3