Testsuite: TLS server testcase consolidation

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

diff --git a/test/confs/0496 b/test/confs/0496
index 4bc2fde19e8ce7fd5822a40530e66ada47fb5423..8819f6230b3ae0efa72f581ee7fcfb19a2ccdba6 100644 (file)
--- a/test/confs/0496
+++ b/test/confs/0496
@@ -1,13 +1,8 @@
 # Exim test configuration 0496
 
 # Exim test configuration 0496
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -19,11 +14,14 @@ acl_smtp_rcpt = check_rcpt
 begin acl
 
 check_rcpt:
 begin acl
 
 check_rcpt:

-  warn     message = data1 data1\ndata2 data2
+  warn     message = data1 data1\ndata2 data2\n
+  warn     message = \n\ndata3\n\ndata4\n\n

   warn     message = :after_received:After-Received: some text\n\
                      :at_start:At-Start: some text\n\
                      :at_end:  At-End: some text
   warn     message = :after_received:After-Received: some text\n\
                      :at_start:At-Start: some text\n\
                      :at_end:  At-End: some text

-  accept
+  warn     message = data4
+  warn     add_header = X-multiline: foo\n\tbar
+  accept   logwrite = $headers_added

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----


@@ -41,7 +39,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

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

   user = CALLER
 
 # End
   user = CALLER
 
 # End