X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/5800e3234f2594639d82e5063d9c522c6a881d25..322ae953e144d9e1fdc06d993d2e4551f5fb1322:/test/stderr/2035

diff --git a/test/stderr/2035 b/test/stderr/2035
index 308b3358d..e0085fb16 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -3,7 +3,7 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...  connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
@@ -35,8 +35,8 @@ sync_responses expect rcpt for userb@test.ex
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+  SMTP connection from CALLER D=qqs closed by QUIT
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -47,21 +47,21 @@ dropping to exim gid; retaining priv uid
 t1 transport entered
   userb@test.ex
 hostlist:
-  '127.0.0.1' IP 127.0.0.1 port 1225
+  '127.0.0.1' IP 127.0.0.1 port PORT_D
 already connected to 127.0.0.1 [127.0.0.1] (on fd 0)
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
-delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userb@test.ex)
+delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userb@test.ex)
 continued connection, proxied TLS
   SMTP>> DATA
 cmd buf flush ddd bytes
 sync_responses expect data
   SMTP<< 354 Enter message, ending with "." on a line by itself
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
 cannot use sendfile for body: spoolfile not wireformat
   SMTP>> .
 writing data block fd=dddd size=sss timeout=300
-  SMTP<< 250 OK id=10HmaY-0005vi-00
+  SMTP<< 250 OK id=10HmaY-000000005vi-0000
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
   SMTP+> QUIT
 cmd buf flush ddd bytes (more expected)
@@ -69,13 +69,13 @@ cmd buf flush ddd bytes (more expected)
   SMTP(TLS shutdown)>>
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
-cmdlog: 'DATA:354:.:250:QUIT:221'
+cmdlog: 'DATA:354:.:250:QUIT+:221'
 Leaving t1 transport
 LOG: MAIN
-  => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00"
+  => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-000000005vi-0000"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
 
 ******** SERVER ********