Testsuite: TLS client testcase consolidation

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

diff --git a/test/confs/0900 b/test/confs/0900
index 869084dd8113b4597afdeb667ce36acbdd8b41f6..ffce9e8863b3f25517d60c1e687cc2c238661538 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -16,6 +16,12 @@ tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
 .ifdef _HAVE_REQTLS
 tls_advertise_requiretls = :
 .endif
 .ifdef _HAVE_REQTLS
 tls_advertise_requiretls = :
 .endif

+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts = :
+.endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif

 
 
 # ----- Main settings -----
 
 
 # ----- Main settings -----


@@ -37,8 +43,7 @@ log_selector = +received_recipients
 .endif
 
 .ifdef _OPT_MAIN_TLS_CERTIFICATE
 .endif
 
 .ifdef _OPT_MAIN_TLS_CERTIFICATE

-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = DIR/aux-fixed/cert1

 .endif
 
 ALLOW
 .endif
 
 ALLOW


@@ -90,7 +95,7 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
   driver = appendfile
   delivery_date_add
   envelope_to_add

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"


@@ -100,6 +105,9 @@ remote_smtp:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S

+  hosts_try_fastopen = :
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s


@@ -108,10 +116,14 @@ remote_smtp_dkim:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S

+  hosts_try_fastopen = :
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
 
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
 

+.ifdef _HAVE_DKIM

 .ifdef SRV
   dkim_domain =                test.ex
   dkim_selector =      sel
 .ifdef SRV
   dkim_domain =                test.ex
   dkim_selector =      sel


@@ -120,6 +132,7 @@ remote_smtp_dkim:
   dkim_sign_headers =  LIST
 .endif
 .endif
   dkim_sign_headers =  LIST
 .endif
 .endif

+.endif

 
 # ----- Retry -----
 
 
 # ----- Retry -----