Testsuite: add delays for predictable log sequencing in 2x36, log-sorting for 2x38

[users/jgh/exim.git] / test / confs / 2102

diff --git a/test/confs/2102 b/test/confs/2102
index 1de92e96296bcea5deef3a93121774c8dc4d56fb..8b2083959934cce838c7c8e5fa7f796973fc49d0 100644 (file)
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -1,13 +1,9 @@
 # Exim test configuration 2102
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
+
 timezone = UTC
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
@@ -59,7 +55,8 @@ check_recipient:
           logwrite =  NB/r <${certextract {notbefore,raw}      {$tls_in_peercert}}>
           logwrite =  NB   <${certextract {notbefore}  {$tls_in_peercert}}>
           logwrite =  NB/i <${certextract {notbefore,int}{$tls_in_peercert}}>
-          logwrite =  NA  <${certextract {notafter}    {$tls_in_peercert}}>
+          logwrite =  NA/i <${certextract {notafter,int}       {$tls_in_peercert}}>
+          logwrite =  NA   <${certextract {notafter}   {$tls_in_peercert}}>
           logwrite =  SA  <${certextract {sig_algorithm}{$tls_in_peercert}}>
           logwrite =  SG  <${certextract {signature}   {$tls_in_peercert}}>
          logwrite =       ${certextract {subj_altname} {$tls_in_peercert} {SAN <$value>}{(no SAN)}}