summaryrefslogtreecommitdiff
path: root/test/stderr/0432
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2012-05-01 20:12:36 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2012-06-04 14:57:02 +0100
commitcb9d95aeae369ae85cd13473cda0bb3ae415fcb9 (patch)
treec18598f05efcf898633966d2253532dce480cd31 /test/stderr/0432
parent817d9f576cdfbc27cf0536be348645baf27d7836 (diff)
Fixup testsuite cases affected by dual-tls - mainly EHLO on callouts.
Diffstat (limited to 'test/stderr/0432')
-rw-r--r--test/stderr/04329
1 files changed, 6 insertions, 3 deletions
diff --git a/test/stderr/0432 b/test/stderr/0432
index a35449b40..33e1b9892 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -89,7 +89,8 @@ 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
+127.0.0.1 in hosts_avoid_esmtp? no (option unset)
+ SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
SMTP>> MAIL FROM:<>
SMTP<< 250 OK
@@ -242,7 +243,8 @@ MUNGED: ::1 will be omitted in what follows
>>> 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
+>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
+>>> SMTP>> EHLO myhost.test.ex
>>> SMTP<< 250 OK
>>> SMTP>> MAIL FROM:<>
>>> SMTP<< 250 OK
@@ -280,7 +282,8 @@ MUNGED: ::1 will be omitted in what follows
>>> 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
+>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
+>>> SMTP>> EHLO myhost.test.ex
>>> SMTP timeout
>>> ----------- end verify ------------
>>> accept: condition test deferred in ACL "mail"