appendfile: tidying

[users/jgh/exim.git] / test / scripts / 4500-DKIM / 4520

diff --git a/test/scripts/4500-DKIM/4520 b/test/scripts/4500-DKIM/4520
index 406db39a5c00b3324baa87e045ffbb850bb479a6..f073be9d368638dd04df51901c427d35bfde9003 100644 (file)
--- a/test/scripts/4500-DKIM/4520
+++ b/test/scripts/4500-DKIM/4520
@@ -11,8 +11,8 @@ From: second@example.com
 content
 ****
 #
-# single header, oversigned
-exim -DOPT=From:From -odf b@test.ex
+# single header, oversigned, with timestamps
+exim -DOPT=From:From -DTIMES=10 -odf b@test.ex
 From: nobody@example.com
 
 content
@@ -51,27 +51,42 @@ X-mine: two
 content
 ****
 #
-# default header set
-exim -DHEADERS_MAXSIZE=y -odf c@test.ex
+## default header set
+# cannot test that as it includes Date: so results in a varying signature
+#exim -DHEADERS_MAXSIZE=y -odf c@test.ex
+#From: nobody@example.com
+#
+#content
+#****
+##
+# check that on signing we warn in debug mode about verify problems
+exim -d-all+acl -DOPT=From -DSELECTOR=sel_bad -odf d@test.ex
 From: nobody@example.com
 
 content
 ****
 #
-# check that on signing we warn in debug mode about verify problems
-exim -d-all+acl -DOPT=From -DSELECTOR=sel_bad -odf d@test.ex
+# check dkim_strict results in a defer (even with an expansion)
+exim -DOPT=From '-DSTRICT=${if ={1}{1}{true}}' '-DTIMES=${bogus}' -odf '-f<>' e0@test.ex
 From: nobody@example.com
 
 content
 ****
 #
 # check that an empty dkim_privatekey overrides dkim_strict
-exim -DOPT=From -DSTRICT=true -DSELECTOR=none -odf a@test.ex
+exim -DOPT=From -DSTRICT=true -DSELECTOR=none -odf e@test.ex
 From: nobody@example.com
 
 content
 ****
 #
+# single header signed, body line starting with dot
+exim -DOPT=From -odf f@test.ex
+From: nobody@example.com
+
+..content
+****
+#
 millisleep 500
 killdaemon
 no_msglog_check