Testsuite: output changes resulting

[exim.git] / test / stderr / 2135

diff --git a/test/stderr/2135 b/test/stderr/2135
index 3888badbb16d4c91d606fe94c73da5d33e931666..66f4d48b6e362bfbea220842b5292400b0b966c7 100644 (file)
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -9,6 +9,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...  connected
 cmd buf flush ddd bytes
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
 cmd buf flush ddd bytes
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800

+         250-LIMITS MAILMAX=1000 RCPTMAX=50000

          250-8BITMIME
          250-PIPELINING
          250-STARTTLS
          250-8BITMIME
          250-PIPELINING
          250-STARTTLS


@@ -20,6 +21,7 @@ cmd buf flush ddd bytes
 cmd buf flush ddd bytes
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
 cmd buf flush ddd bytes
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800

+         250-LIMITS MAILMAX=1000 RCPTMAX=50000

          250-8BITMIME
          250-PIPELINING
          250 HELP
          250-8BITMIME
          250-PIPELINING
          250 HELP


@@ -35,7 +37,7 @@ 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
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
 LOG: smtp_connection MAIN

-  SMTP connection from CALLER closed by QUIT
+  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
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config


@@ -49,9 +51,9 @@ t1 transport entered
 hostlist:
   '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)
 hostlist:
   '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
 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
 continued connection, proxied TLS
   SMTP>> DATA
 cmd buf flush ddd bytes


@@ -61,7 +63,7 @@ sync_responses expect data
 cannot use sendfile for body: spoolfile not wireformat
   SMTP>> .
 writing data block fd=dddd size=sss timeout=300
 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)
 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,10 +71,10 @@ cmd buf flush ddd bytes (more expected)
   SMTP(TLS shutdown)>>
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
   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
 Leaving t1 transport
 LOG: MAIN

-  => 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-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=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>