From 087b6b26fa9be49f9ce52bf8941b5a69d1ec31ce Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 2 Jun 2017 11:58:28 +0100 Subject: [PATCH] Testsuite: stabilize output sequence for 2x35/6 --- test/confs/2035 | 75 ++++++++++++++-------------------- test/confs/2135 | 74 ++++++++++++++------------------- test/log/2035 | 10 ++--- test/log/2036 | 22 ++++------ test/log/2037 | 8 ++-- test/log/2135 | 10 ++--- test/log/2136 | 24 ++++------- test/log/2137 | 2 - test/rejectlog/2037 | 9 ++-- test/scripts/2000-GnuTLS/2035 | 9 ++-- test/scripts/2000-GnuTLS/2036 | 6 +++ test/scripts/2000-GnuTLS/2037 | 4 +- test/scripts/2100-OpenSSL/2135 | 9 ++-- test/scripts/2100-OpenSSL/2136 | 4 ++ test/stderr/2035 | 73 +++++++++++++++++++++++++++++++++ test/stderr/2135 | 73 +++++++++++++++++++++++++++++++++ 16 files changed, 266 insertions(+), 146 deletions(-) create mode 100644 test/stderr/2035 create mode 100644 test/stderr/2135 diff --git a/test/confs/2035 b/test/confs/2035 index 52b9456b1..f7f225746 100644 --- a/test/confs/2035 +++ b/test/confs/2035 @@ -1,6 +1,4 @@ -# Exim test configuration 2035 - -OPT = +# Exim test configuration 2135 .include DIR/aux-var/tls_conf_prefix @@ -15,73 +13,62 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- -acl_smtp_rcpt = check_rcpt -acl_smtp_data = check_data +.ifdef SERVER +acl_smtp_rcpt = srvr_rcpt +acl_smtp_data = srvr_data +.else +acl_smtp_rcpt = client_rcpt +acl_smtp_data = client_data +.endif log_selector = +received_recipients +outgoing_port -OPT + +.ifdef SERVER +queue_only +queue_run_in_order = true +.endif # ----- ACLs ----- begin acl -check_rcpt: +client_rcpt: accept - condition = ${if or { {!eq {SERVER}{server}} {= {$received_port}{PORT_S}} }} verify = recipient/callout=use_sender,hold - defer condition = ${if eq {SERVER}{server}} - local_parts = rcpt_defer + +client_data: accept -check_data: - warn logwrite = received on port $received_port - defer condition = ${if eq {SERVER}{server}} - condition = ${if eq {data_defer}{${local_part:$recipients}}} +srvr_rcpt: + defer local_parts = rcpt_defer accept -delay: - warn condition = ${if = {$received_port}{PORT_D}} - delay = 1s +srvr_data: + defer condition = ${if eq {data_defer}{${local_part:$recipients}}} accept # ----- Routers ----- begin routers -.ifdef SERVER - target: - driver = redirect - condition = ${if = {$received_port}{PORT_D}} - address_data = ${acl {delay}} - data = :blackhole: - -dut: - driver = manualroute - route_list = * 127.0.0.1 - self = send - transport = t1 - -.else + driver = redirect + condition = ${if or {{eq {SERVER}{server}} {queue_running}}} + data = :blackhole: client: - driver = manualroute - route_list = * 127.0.0.1 - self = send - transport = t1 - errors_to = "" - -.endif - + driver = manualroute + route_list= * 127.0.0.1::PORT_D + self = send + transport = t1 + errors_to = "" begin transports t1: - driver = smtp - port = PORT_D - tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem - tls_verify_cert_hostnames = : - + driver = smtp + tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem + tls_verify_cert_hostnames = : # ----- Retry ----- begin retry diff --git a/test/confs/2135 b/test/confs/2135 index 68762146c..f7f225746 100644 --- a/test/confs/2135 +++ b/test/confs/2135 @@ -1,7 +1,5 @@ # Exim test configuration 2135 -OPT = - .include DIR/aux-var/tls_conf_prefix .ifdef SERVER @@ -15,77 +13,65 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- -acl_smtp_rcpt = check_rcpt -acl_smtp_data = check_data +.ifdef SERVER +acl_smtp_rcpt = srvr_rcpt +acl_smtp_data = srvr_data +.else +acl_smtp_rcpt = client_rcpt +acl_smtp_data = client_data +.endif log_selector = +received_recipients +outgoing_port -OPT + +.ifdef SERVER +queue_only +queue_run_in_order = true +.endif # ----- ACLs ----- begin acl -check_rcpt: +client_rcpt: accept - condition = ${if or { {!eq {SERVER}{server}} {= {$received_port}{PORT_S}} }} verify = recipient/callout=use_sender,hold - defer condition = ${if eq {SERVER}{server}} - local_parts = rcpt_defer + +client_data: accept -check_data: - warn logwrite = received on port $received_port - defer condition = ${if eq {SERVER}{server}} - condition = ${if eq {data_defer}{${local_part:$recipients}}} +srvr_rcpt: + defer local_parts = rcpt_defer accept -delay: - warn condition = ${if = {$received_port}{PORT_D}} - delay = 1s +srvr_data: + defer condition = ${if eq {data_defer}{${local_part:$recipients}}} accept # ----- Routers ----- begin routers -.ifdef SERVER - target: - driver = redirect - condition = ${if = {$received_port}{PORT_D}} - address_data = ${acl {delay}} - data = :blackhole: - -dut: - driver = manualroute - route_list = * 127.0.0.1 - self = send - transport = t1 - -.else + driver = redirect + condition = ${if or {{eq {SERVER}{server}} {queue_running}}} + data = :blackhole: client: - driver = manualroute - route_list = * 127.0.0.1 - self = send - transport = t1 - errors_to = "" - -.endif - + driver = manualroute + route_list= * 127.0.0.1::PORT_D + self = send + transport = t1 + errors_to = "" begin transports t1: - driver = smtp - port = PORT_D - tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem - tls_verify_cert_hostnames = : - + driver = smtp + tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem + tls_verify_cert_hostnames = : # ----- Retry ----- begin retry * * F,5d,10s - # End diff --git a/test/log/2035 b/test/log/2035 index 5d7edb1d0..423d9be13 100644 --- a/test/log/2035 +++ b/test/log/2035 @@ -1,11 +1,11 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 received on port 0 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for userb@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:25 X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=target +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaY-0005vi-00 received on port 1225 1999-03-02 09:44:33 10HmaY-0005vi-00 <= usera@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userb@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=target -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/2036 b/test/log/2036 index 17125939d..33b6423ef 100644 --- a/test/log/2036 +++ b/test/log/2036 @@ -1,18 +1,14 @@ +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: R=target +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=target +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1224 -1999-03-02 09:44:33 10HmaX-0005vi-00 received on port 1224 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userc@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userd@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 received on port 1225 -1999-03-02 09:44:33 10HmaY-0005vi-00 <= userc@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss for userd@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => userd@test.ex R=dut T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=target -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1224 -1999-03-02 09:44:33 10HmaZ-0005vi-00 received on port 1224 -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= usere@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userf@test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 received on port 1225 -1999-03-02 09:44:33 10HmbA-0005vi-00 <= usere@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss for userf@test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userf@test.ex R=dut T=t1 H=127.0.0.1 [127.0.0.1]:1225 C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 <= usere@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userf@test.ex diff --git a/test/log/2037 b/test/log/2037 index 4ca37620f..ac307f28d 100644 --- a/test/log/2037 +++ b/test/log/2037 @@ -1,10 +1,8 @@ -1999-03-02 09:44:33 U=CALLER F= temporarily rejected RCPT : Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:: 451 Temporary local problem - please try later -1999-03-02 09:44:33 10HmaY-0005vi-00 received on port 0 +1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT : Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:: 451 Temporary local problem - please try later 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for data_defer@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 == data_defer@test.ex R=client T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]:1111: SMTP error from remote mail server after end of data: 451 Temporary local problem - please try later ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F= temporarily rejected RCPT -1999-03-02 09:44:33 10HmaX-0005vi-00 received on port 1225 -1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F= temporarily rejected after DATA +1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<> temporarily rejected RCPT +1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<> temporarily rejected after DATA diff --git a/test/log/2135 b/test/log/2135 index daade7dd3..ee8d8709a 100644 --- a/test/log/2135 +++ b/test/log/2135 @@ -1,11 +1,11 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 received on port 0 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for userb@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:25 X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=target +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaY-0005vi-00 received on port 1225 1999-03-02 09:44:33 10HmaY-0005vi-00 <= usera@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userb@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=target -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/2136 b/test/log/2136 index 027ea881e..33b6423ef 100644 --- a/test/log/2136 +++ b/test/log/2136 @@ -1,20 +1,14 @@ +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: R=target +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=target +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1224 -1999-03-02 09:44:33 10HmaX-0005vi-00 received on port 1224 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userc@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userd@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 received on port 1225 -1999-03-02 09:44:33 10HmaY-0005vi-00 <= userc@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss for userd@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => userd@test.ex R=dut T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=target -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1224 -1999-03-02 09:44:33 10HmaZ-0005vi-00 received on port 1224 -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= usere@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userf@test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 received on port 1225 -1999-03-02 09:44:33 10HmbA-0005vi-00 <= usere@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss for userf@test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userf@test.ex R=dut T=t1 H=127.0.0.1 [127.0.0.1]:1225 C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: R=target -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 <= usere@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userf@test.ex diff --git a/test/log/2137 b/test/log/2137 index 5d0436069..360f31ed6 100644 --- a/test/log/2137 +++ b/test/log/2137 @@ -1,10 +1,8 @@ 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT : Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:: 451 Temporary local problem - please try later -1999-03-02 09:44:33 10HmaY-0005vi-00 received on port 0 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for data_defer@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 == data_defer@test.ex R=client T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]:1111: SMTP error from remote mail server after end of data: 451 Temporary local problem - please try later ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> temporarily rejected RCPT -1999-03-02 09:44:33 10HmaX-0005vi-00 received on port 1225 1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> temporarily rejected after DATA diff --git a/test/rejectlog/2037 b/test/rejectlog/2037 index 19259d512..210641393 100644 --- a/test/rejectlog/2037 +++ b/test/rejectlog/2037 @@ -1,14 +1,13 @@ -1999-03-02 09:44:33 U=CALLER F= temporarily rejected RCPT : Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:: 451 Temporary local problem - please try later +1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT : Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:: 451 Temporary local problem - please try later ******** SERVER ******** -1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F= temporarily rejected RCPT -1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F= temporarily rejected after DATA -Envelope-from: +1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<> temporarily rejected RCPT +1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<> temporarily rejected after DATA +Envelope-from: <> Envelope-to: P Received: from localhost ([127.0.0.1] helo=myhost.test.ex) by myhost.test.ex with esmtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) - (envelope-from ) id 10HmaX-0005vi-00 for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) diff --git a/test/scripts/2000-GnuTLS/2035 b/test/scripts/2000-GnuTLS/2035 index 557a04e0f..94923aa60 100644 --- a/test/scripts/2000-GnuTLS/2035 +++ b/test/scripts/2000-GnuTLS/2035 @@ -6,9 +6,10 @@ need_ipv4 exim -bd -DSERVER=server -oX PORT_D **** # -# a recipient verify and continued-delivery +# A recipient verify and continued-delivery. The debug output should show "already connected to", +# "proxied TLS", and the DATA smtp command only done by the transport process. # cmdline -bs send -exim -bs +exim -d-all+transport -bs mail from: rcpt to: data @@ -18,8 +19,10 @@ body . quit **** -sleep 3 +sleep 1 killdaemon +exim -q +**** # # no_stdout_check diff --git a/test/scripts/2000-GnuTLS/2036 b/test/scripts/2000-GnuTLS/2036 index 76a55e227..cd6e9a121 100644 --- a/test/scripts/2000-GnuTLS/2036 +++ b/test/scripts/2000-GnuTLS/2036 @@ -2,6 +2,7 @@ gnutls need_ipv4 # +# a recipient verify and continued-delivery # smtp send # a tls-capable target for the verify/delivery connection on PORT_D # plus a daemon under test on PORT_S @@ -33,6 +34,8 @@ QUIT **** sleep 3 killdaemon +exim -q +**** # # # smtp send, deliver_drop_priv @@ -64,6 +67,9 @@ QUIT **** sleep 3 killdaemon +exim -q +**** +# # # no_stdout_check diff --git a/test/scripts/2000-GnuTLS/2037 b/test/scripts/2000-GnuTLS/2037 index 37891ad1a..ad13a3f94 100644 --- a/test/scripts/2000-GnuTLS/2037 +++ b/test/scripts/2000-GnuTLS/2037 @@ -6,7 +6,7 @@ exim -bd -DSERVER=server -oX PORT_D **** # cmdline -bs send, rcpt-time defer exim -bs -mail from: +mail from:<> rcpt to: quit **** @@ -14,7 +14,7 @@ sleep 3 # # cmdline -bs send, data-time defer exim -bs -mail from: +mail from:<> rcpt to: data Subject: test diff --git a/test/scripts/2100-OpenSSL/2135 b/test/scripts/2100-OpenSSL/2135 index 1f760e4ef..ff460c671 100644 --- a/test/scripts/2100-OpenSSL/2135 +++ b/test/scripts/2100-OpenSSL/2135 @@ -5,9 +5,10 @@ need_ipv4 exim -bd -DSERVER=server -oX PORT_D **** # -# a recipient verify and continued-delivery +# A recipient verify and continued-delivery. The debug output should show "already connected to", +# "proxied TLS", and the DATA smtp command only done by the transport process. # cmdline -bs send -exim -bs +exim -d-all+transport -bs mail from: rcpt to: data @@ -17,8 +18,10 @@ body . quit **** -sleep 3 +sleep 1 killdaemon +exim -q +**** # # no_stdout_check diff --git a/test/scripts/2100-OpenSSL/2136 b/test/scripts/2100-OpenSSL/2136 index c18cf946c..396075cc1 100644 --- a/test/scripts/2100-OpenSSL/2136 +++ b/test/scripts/2100-OpenSSL/2136 @@ -33,6 +33,8 @@ QUIT **** sleep 3 killdaemon +exim -q +**** # # # smtp send, deliver_drop_priv @@ -64,6 +66,8 @@ QUIT **** sleep 3 killdaemon +exim -q +**** # # # diff --git a/test/stderr/2035 b/test/stderr/2035 new file mode 100644 index 000000000..aa0e43805 --- /dev/null +++ b/test/stderr/2035 @@ -0,0 +1,73 @@ +Exim version x.yz .... +configuration file is TESTSUITE/test-config +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 + 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<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250-STARTTLS + 250 HELP + SMTP>> STARTTLS +cmd buf flush ddd bytes + SMTP<< 220 TLS go ahead + SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes + SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250 HELP +using PIPELINING +not using DSN + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: +cmd buf flush ddd bytes + SMTP<< 250 OK + 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 terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +trusted user +admin user +>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> +--------> userb@test.ex <-------- +t1 transport entered + userb@test.ex +hostlist: + 127.0.0.1:1225 +already connected to 127.0.0.1 [127.0.0.1] (on fd 0) +checking 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) +continued connection, proxied TLS + SMTP>> DATA +cmd buf flush ddd bytes + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP>> writing message and terminating "." +cannot use sendfile for body: spoolfile not wireformat +writing data block fd=dddd size=sss timeout=300 + SMTP<< 250 OK id=10HmaY-0005vi-00 +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(close)>> +Leaving t1 transport +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +LOG: MAIN + => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:25 X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> + +******** SERVER ******** diff --git a/test/stderr/2135 b/test/stderr/2135 new file mode 100644 index 000000000..c61239a11 --- /dev/null +++ b/test/stderr/2135 @@ -0,0 +1,73 @@ +Exim version x.yz .... +configuration file is TESTSUITE/test-config +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 + 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<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250-STARTTLS + 250 HELP + SMTP>> STARTTLS +cmd buf flush ddd bytes + SMTP<< 220 TLS go ahead + SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes + SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250 HELP +using PIPELINING +not using DSN + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: +cmd buf flush ddd bytes + SMTP<< 250 OK + 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 terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +trusted user +admin user +>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> +--------> userb@test.ex <-------- +t1 transport entered + userb@test.ex +hostlist: + 127.0.0.1:1225 +already connected to 127.0.0.1 [127.0.0.1] (on fd 0) +checking 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) +continued connection, proxied TLS + SMTP>> DATA +cmd buf flush ddd bytes + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP>> writing message and terminating "." +cannot use sendfile for body: spoolfile not wireformat +writing data block fd=dddd size=sss timeout=300 + SMTP<< 250 OK id=10HmaY-0005vi-00 +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(close)>> +Leaving t1 transport +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +LOG: MAIN + => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:25 X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> + +******** SERVER ******** -- 2.30.2