Fix handling of server which follows a RCPT 452 with a 250. Bug 26092

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

diff --git a/test/stderr/4052 b/test/stderr/4052
index 3de6f8289624d8590c78007dc18c35cce4b02211..49bee93f2957d06f2e160fa9a35c638aa9cdb32b 100644 (file)
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -3,8 +3,6 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss

-fresh-exec forking for local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -12,7 +10,6 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> extchange@test.ex <--------
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> extchange@test.ex <--------

-local-accept-delivery forking for transport

 smtp transport entered
   extchange@test.ex
 hostlist:
 smtp transport entered
   extchange@test.ex
 hostlist:


@@ -39,14 +36,14 @@ smtp_reap_early_pipe expect banner
 smtp_reap_early_pipe expect ehlo
   SMTP<< 250-esmtp-resp
          250-PIPELINING
 smtp_reap_early_pipe expect ehlo
   SMTP<< 250-esmtp-resp
          250-PIPELINING

-         250-X_PIPE_CONNECT
+         250-PIPE_CONNECT

          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
          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<< 250 rcpt-to accepted
 sync_responses expect data
   SMTP<< 354 data go-ahead


@@ -57,11 +54,11 @@ writing data block fd=dddd size=sss timeout=300
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1

-no messages waiting for 127.0.0.1
+ no messages waiting for 127.0.0.1
+transport_check_waiting: FALSE

   SMTP>> QUIT
   SMTP>> QUIT

-cmd buf flush ddd bytes
+cmd buf flush ddd bytes (more expected)

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

-local-accept-delivery forked for transport: npppp

 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"
 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"