testsuite output changes

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

diff --git a/test/confs/4560 b/test/confs/4560
index 1012a38970af15b9575414b5783f52a6dde923b7..ad634a42efddb8fa30658d8662fb62b0d72b7c72 100644 (file)
--- a/test/confs/4560
+++ b/test/confs/4560
@@ -1,6 +1,8 @@
 # Exim test configuration 4560
 
 SERVER=
+VALUE=
+INSERT=
 
 .include DIR/aux-var/std_conf_prefix
 
@@ -18,7 +20,23 @@ queue_only
 begin acl
 
 check_data:
-  warn !verify =       arc
+  warn !verify =       arc VALUE
+       INSERT
+
+  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
 .else
@@ -64,16 +82,20 @@ tfile:
 
 tsmtp:
   driver =     smtp
-  hosts =      HOSTIPV4
+  hosts =      127.0.0.1
   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
+.endif
 
 tmlist:
   driver =     smtp
-  hosts =      HOSTIPV4
+  hosts =      127.0.0.1
   port =       PORT_D
   allow_localhost
   transport_filter =   /bin/cat - DIR/aux-fixed/TESTNUM.mlistfooter