Fixup testsuite cases affected by dual-tls - mainly EHLO on callouts.

[users/heiko/exim.git] / test / stderr / 5400

diff --git a/test/stderr/5400 b/test/stderr/5400
index c8331e5daca2927ace2c4a121ae830a0629db9d4..c32d902b56d762590f3ef4d192c19ff662e956ba 100644 (file)
--- a/test/stderr/5400
+++ b/test/stderr/5400
@@ -9,7 +9,7 @@ accept: condition test succeeded in inline ACL
 ----------- start cutthrough setup ------------
 Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP<< 220 ESMTP
 ----------- start cutthrough setup ------------
 Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP<< 220 ESMTP

-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex

   SMTP<< 250 OK
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK


@@ -20,12 +20,14 @@ processing "accept"
 accept: condition test succeeded in inline ACL
   SMTP>> DATA
   SMTP<< 354 Send data
 accept: condition test succeeded in inline ACL
   SMTP>> DATA
   SMTP<< 354 Send data

+  SMTP>>(nl)

   SMTP>> .
   SMTP<< 250 OK
   SMTP>> .
   SMTP<< 250 OK

------------ cutthrough close ------------

 LOG: MAIN
 LOG: MAIN

-  >> userx@domain.com R=all T=smtp
+  >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]

 created log directory TESTSUITE/spool/log
 created log directory TESTSUITE/spool/log

+  SMTP>> QUIT
+----------- cutthrough shutdown ------------

 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
 LOG: MAIN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
 LOG: MAIN


@@ -44,11 +46,11 @@ accept: condition test succeeded in inline ACL
 ----------- start cutthrough setup ------------
 Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP<< 220 ESMTP
 ----------- start cutthrough setup ------------
 Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP<< 220 ESMTP

-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex

   SMTP<< 250 OK
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK

-  SMTP>> RCPT TO:<userx@domain.com>
+  SMTP>> RCPT TO:<usery@domain.com>

   SMTP<< 250 Recipient OK
 ----------- end cutthrough setup ------------
 processing "accept"
   SMTP<< 250 Recipient OK
 ----------- end cutthrough setup ------------
 processing "accept"


@@ -66,13 +68,13 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 trusted user
 admin user
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

---------> userx@domain.com <--------
+--------> usery@domain.com <--------

 smtp transport entered
 smtp transport entered

-  userx@domain.com

   usery@domain.com
   usery@domain.com

+  userz@domain.com

 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 status = usable
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 status = usable

-delivering 10HmaY-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com, ...)
+delivering 10HmaY-0005vi-00 to 127.0.0.1 [127.0.0.1] (usery@domain.com, ...)

 Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
 Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex


@@ -80,10 +82,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
 not using PIPELINING
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK
 not using PIPELINING
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK

-  SMTP>> RCPT TO:<userx@domain.com>
-  SMTP<< 250 Recipient OK

   SMTP>> RCPT TO:<usery@domain.com>
   SMTP<< 250 Recipient OK
   SMTP>> RCPT TO:<usery@domain.com>
   SMTP<< 250 Recipient OK

+  SMTP>> RCPT TO:<userz@domain.com>
+  SMTP<< 250 Recipient OK

   SMTP>> DATA
   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."
   SMTP>> DATA
   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."


@@ -95,10 +97,3 @@ transport_check_waiting entered
 no messages waiting for 127.0.0.1
   SMTP>> QUIT
 Leaving smtp transport
 no messages waiting for 127.0.0.1
   SMTP>> QUIT
 Leaving smtp transport

-LOG: MAIN
-  => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]
-LOG: MAIN
-  -> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]
-LOG: MAIN
-  Completed
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>