Compiler quietening

[exim.git] / test / stderr / 2135

diff --git a/test/stderr/2135 b/test/stderr/2135
index 4359c4ab265657eef7c4713ac064745bed47a0a6..502516dd5c407e99b81f70ec8dfd199204295f1b 100644 (file)
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -3,8 +3,7 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER

-Transport port=25 replaced by host-specific port=1225
-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
   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


@@ -26,20 +25,18 @@ cmd buf flush ddd bytes
          250 HELP
 using PIPELINING
 not using DSN
          250 HELP
 using PIPELINING
 not using DSN

-  SMTP>> MAIL FROM:<usera@ok.example>
+  SMTP|> MAIL FROM:<usera@ok.example>

   SMTP>> RCPT TO:<userb@test.ex>
 cmd buf flush ddd bytes
 sync_responses expect mail
   SMTP<< 250 OK
   SMTP>> RCPT TO:<userb@test.ex>
 cmd buf flush ddd bytes
 sync_responses expect mail
   SMTP<< 250 OK

-sync_responses expect rcpt
+sync_responses expect rcpt for userb@test.ex

   SMTP<< 250 Accepted
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
 LOG: smtp_connection MAIN
   SMTP<< 250 Accepted
 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 (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
-proxy-proc inter-pid pppp
-proxy-proc final-pid pppp
+  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
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -50,31 +47,35 @@ dropping to exim gid; retaining priv uid
 t1 transport entered
   userb@test.ex
 hostlist:
 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)
 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)
-Transport port=25 replaced by host-specific port=1225
+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
 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
 cannot use sendfile for body: spoolfile not wireformat

+  SMTP>> .

 writing data block fd=dddd size=sss timeout=300
 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
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL

-  SMTP>> QUIT
-cmd buf flush ddd bytes
+  SMTP+> QUIT
+cmd buf flush ddd bytes (more expected)
+  SMTP(shutdown)>>
+  SMTP(TLS shutdown)>>
+  SMTP<< 221 myhost.test.ex closing connection

   SMTP(close)>>
   SMTP(close)>>

->>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+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]: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
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>

 
 ******** SERVER ********
 
 ******** SERVER ********