Testsuite: separate cases for TLS resumption with/out OCSP

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

diff --git a/test/confs/4560 b/test/confs/4560
index 10ead1c51c5b2b9826e89976dc928ef6a7853332..8c5864b9a5f48a38017d4d80bead453e72ff637b 100644 (file)
--- a/test/confs/4560
+++ b/test/confs/4560
@@ -15,6 +15,7 @@ acl_smtp_data = check_data
 
 log_selector = +received_recipients +dkim_verbose
 queue_only
 
 log_selector = +received_recipients +dkim_verbose
 queue_only

+queue_run_in_order

 
 # ----- ACL -----
 begin acl
 
 # ----- ACL -----
 begin acl


@@ -23,10 +24,19 @@ check_data:
   warn !verify =       arc VALUE
        INSERT
 
   warn !verify =       arc VALUE
        INSERT
 

-  warn logwrite =      arc_state: <$arc_state>
-       logwrite =      domains:   <$arc_domains>
-       condition =     ${if def:arc_state_reason}
-       logwrite =      reason:    <$arc_state_reason>
+  warn logwrite =      arc_state:      <$arc_state>
+       logwrite =      domains:        <$arc_domains>
+       logwrite =      arc_oldest_pass <$arc_oldest_pass>
+       logwrite =      reason:         <$arc_state_reason>
+       logwrite =      lh_A-R:         <$lh_Authentication-Results:>
+       logwrite =      lh-ams:         <$lh_ARC-Authentication-Results:>
+#      logwrite =      oldest-p-ams:   <${listextract {$arc_oldest_pass} {$lh_ARC-Authentication-Results:}}>
+       logwrite =      oldest-p-ams:   <${reduce {$lh_ARC-Authentication-Results:} \
+                                               {} \
+                                               {${if = {$arc_oldest_pass} \
+                                                       {${extract {i}{${extract {1}{;}{$item}}}}} \
+                                                       {$item} {$value}}} \
+                                       }>

 
 .ifdef OPTION
   accept
 
 .ifdef OPTION
   accept


@@ -68,7 +78,7 @@ begin transports
 
 tfile:
   driver =     appendfile
 
 tfile:
   driver =     appendfile

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

   user =       CALLER
 
 tsmtp:
   user =       CALLER
 
 tsmtp:


@@ -77,8 +87,12 @@ tsmtp:
   port =       PORT_D
   allow_localhost
 .ifndef OPTION
   port =       PORT_D
   allow_localhost
 .ifndef OPTION

+.ifdef BAD
+  arc_sign =   $primary_hostname : sel : MISSING_KEY
+.else

   arc_sign =   $primary_hostname : sel : DIR/aux-fixed/dkim/dkim.private
 .endif
   arc_sign =   $primary_hostname : sel : DIR/aux-fixed/dkim/dkim.private
 .endif

+.endif

 
 tmlist:
   driver =     smtp
 
 tmlist:
   driver =     smtp