Ensure lookup-result variables are dropped between messages on a connection

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

diff --git a/test/confs/4525 b/test/confs/4525
index 3a843b99eafa4a4f770e764a6e7a634fe5ca69fb..a5b7f2cd05927dd95fd2a2b2d08554e77ce690e9 100644 (file)
--- a/test/confs/4525
+++ b/test/confs/4525
@@ -4,16 +4,15 @@ SERVER=
 OPT=
 FAKE =
 
 OPT=
 FAKE =
 

-keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-add_environment = SSLKEYLOGFILE=/home/jgh/git/exim/test/spool/sslkeys
+keep_environment = PATH

 exim_path = EXIM_PATH
 host_lookup_order = bydns
 exim_path = EXIM_PATH
 host_lookup_order = bydns

-spool_directory = /home/jgh/git/exim/test/spool
+spool_directory = DIR/spool

 
 .ifdef SERVER
 
 .ifdef SERVER

-log_file_path = /home/jgh/git/exim/test/spool/log/SERVER%slog
+log_file_path = DIR/spool/log/SERVER%slog

 .else
 .else

-log_file_path = /home/jgh/git/exim/test/spool/log/%slog
+log_file_path = DIR/spool/log/%slog

 .endif
 
 gecos_pattern = ""
 .endif
 
 gecos_pattern = ""


@@ -69,6 +68,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

 
 .ifdef FILTER
   transport_filter =   /bin/cat - DIR/aux-fixed/TESTNUM.mlistfooter
 
 .ifdef FILTER
   transport_filter =   /bin/cat - DIR/aux-fixed/TESTNUM.mlistfooter


@@ -107,7 +107,7 @@ send_to_server:
 
 file:
   driver =     appendfile
 
 file:
   driver =     appendfile

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

   user =       CALLER
 
 # End
   user =       CALLER
 
 # End