Testsuite: make "client" util TLS variants more similar

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

diff --git a/test/confs/0375 b/test/confs/0375
index 3b622ae9ff72a26a95a3c5736be24e98605b40a3..dce134ef7233af7b900920222e84070513d5cd3a 100644 (file)
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -1,14 +1,8 @@
 # Exim test configuration 0375
 
 # Exim test configuration 0375
 

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

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

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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


@@ -91,7 +85,7 @@ begin transports
 # Successful local transport
 ut1:
   driver = appendfile
 # Successful local transport
 ut1:
   driver = appendfile

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

   user = CALLER
   return_path_add
   envelope_to_add
   user = CALLER
   return_path_add
   envelope_to_add


@@ -120,6 +114,7 @@ ut4:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   max_rcpt = 1
   disable_logging
   allow_localhost
   max_rcpt = 1
   disable_logging


@@ -130,6 +125,7 @@ ut5:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   max_rcpt = 1
   disable_logging
   allow_localhost
   max_rcpt = 1
   disable_logging


@@ -141,6 +137,7 @@ ut6:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   max_rcpt = 1
   disable_logging
   allow_localhost
   max_rcpt = 1
   disable_logging


@@ -149,7 +146,7 @@ ut6:
 # Real delivery
 real:
   driver = appendfile
 # Real delivery
 real:
   driver = appendfile

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

   user = CALLER
   return_path_add
   envelope_to_add
   user = CALLER
   return_path_add
   envelope_to_add