Testsuite: avoid using STARTTLS in a non-TLS testcase

[users/heiko/exim.git] / test / confs / 2035

diff --git a/test/confs/2035 b/test/confs/2035
index a10dc53e993acac79b9203550b0620e360ff9883..f7f2257462ef38fdf9fe7c97ee981fcfcef97384 100644 (file)
--- 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
 
 
 .include DIR/aux-var/tls_conf_prefix
 


@@ -15,67 +13,62 @@ primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
 
 # ----- 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
 
 log_selector = +received_recipients +outgoing_port

-OPT
+
+.ifdef SERVER
+queue_only
+queue_run_in_order = true
+.endif

 
 # ----- ACLs -----
 
 begin acl
 
 
 # ----- ACLs -----
 
 begin acl
 

-check_rcpt:
+client_rcpt:

   accept
   accept

-       condition =     ${if or { {!eq {SERVER}{server}} {= {$received_port}{PORT_S}} }}

        verify =        recipient/callout=use_sender,hold
        verify =        recipient/callout=use_sender,hold

-  defer        condition =     ${if eq {SERVER}{server}}
-       local_parts =   rcpt_defer
+
+client_data:
+  accept
+
+srvr_rcpt:
+  defer        local_parts =   rcpt_defer

   accept
 
   accept
 

-check_data:
-  warn logwrite = $message_exim_id received on port $received_port
-  defer        condition =     ${if eq {SERVER}{server}}
-       condition =     ${if eq {data_defer}{${local_part:$recipients}}}
+srvr_data:
+  defer        condition =     ${if eq {data_defer}{${local_part:$recipients}}}

   accept
 
 # ----- Routers -----
 
 begin routers
 
   accept
 
 # ----- Routers -----
 
 begin routers
 

-.ifdef SERVER
-

 target:
 target:

-  driver = redirect
-  condition = ${if = {$received_port}{PORT_D}}
-  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:
 
 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:
 
 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
 
 # ----- Retry -----
 begin retry