Merge branch 'master' into 4.next

[exim.git] / test / stderr / 4052

diff --git a/test/stderr/4052 b/test/stderr/4052
index d4866ed885d7ee3ca183e498d8cead6e0a1edc1c..184891086f2df364e65c3a587199bfccb931f6a7 100644 (file)
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -1,9 +1,11 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -13,58 +15,64 @@ dropping to exim gid; retaining priv uid
 smtp transport entered
   extchange@test.ex
 hostlist:
-  '127.0.0.1' IP 127.0.0.1 port 1225
-checking status of 127.0.0.1
+  '127.0.0.1' IP 127.0.0.1 port PORT_D
+checking retry status of 127.0.0.1
 no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
-delivering 10HmbP-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@test.ex)
-Transport port=25 replaced by host-specific port=1225
+delivering 10HmbP-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (extchange@test.ex)
+Transport port=25 replaced by host-specific port=PORT_D
 EHLO response bits from cache: cleartext 0x0120/0x0000 crypted 0x0000/0x0000
-Using cached cleartext PIPE_CONNECT
-  SMTP>> EHLO the.local.host.name
+Using cached cleartext PIPECONNECT
+  SMTP|> EHLO the.local.host.name
 using PIPELINING
 not using DSN
-  SMTP>> MAIL FROM:<CALLER@the.local.host.name>
-  SMTP>> RCPT TO:<extchange@test.ex>
+  SMTP|> MAIL FROM:<CALLER@the.local.host.name>
+  SMTP|> RCPT TO:<extchange@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... sending dd nonTFO early-data
- connected
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
+sending dd nonTFO early-data
+connected
 smtp_reap_early_pipe expect banner
   SMTP<< 220 banner
 smtp_reap_early_pipe expect ehlo
   SMTP<< 250-esmtp-resp
          250-PIPELINING
-         250-PIPE_CONNECT
+         250-PIPECONNECT
          250-SIZE
          250 ok
 EHLO cleartext extensions changed, 0x0120/0x0000 -> 0x0160/0x0000
 writing clr 0160/0000 cry 0000/0000
 sync_responses expect mail
   SMTP<< 250 mail-from accepted
-sync_responses expect rcpt
+sync_responses expect rcpt for extchange@test.ex
   SMTP<< 250 rcpt-to accepted
 sync_responses expect data
   SMTP<< 354 data go-ahead
-  SMTP>> writing message and terminating "."
-cannot use sendfile for body: spoolfile not wireformat
-writing data block fd=dddd size=sss timeout=300
-  SMTP<< 250 message accepted
-ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
+  SMTP>> (writing message)
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
  no messages waiting for 127.0.0.1
 transport_check_waiting: FALSE
-  SMTP>> QUIT
-cmd buf flush ddd bytes
+will pipeline QUIT
+cannot use sendfile for body: spoolfile not wireformat
+  SMTP>> .
+writing data block fd=dddd size=sss timeout=300 (more expected)
+  SMTP+> QUIT
+cmd buf flush ddd bytes (more expected)
+  SMTP(shutdown)>>
+  SMTP<< 250 message accepted
+ok=1 send_quit=0 send_rset=0 continue_more=0 yield=0 first_address is NULL
+  SMTP<< 220 bye
   SMTP(close)>>
+cmdlog: 'EHLO|:MAIL|:RCPT|:DATA:220:250-:250:250:354:.:QUIT+:250:220'
 Leaving smtp transport
 LOG: MAIN
   => extchange@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1242 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 
 ******** SERVER ********