Testsuite: SPF testcase additions

diff --git a/test/dnszones-src/db.example.com b/test/dnszones-src/db.example.com
index 6b35113e2a24c5056a30e1c2d1103b470b566f22..b12d9a6a686cb2114e6d1e171b4ae41a8f08234c 100644 (file)
--- a/test/dnszones-src/db.example.com
+++ b/test/dnszones-src/db.example.com
@@ -28,6 +28,10 @@ example.com. TXT     v=spf1 -all
 double         TXT     v=spf1 include:_spf.google.com ~all
                TXT     v=spf1 +a +mx -all
 
+doubleplus     TXT     v=spf1 include:_spf.google.com ~all
+               TXT     google-site-verification=q-4MSVLjluQIsBztu5jzJBxAcJXzNcHAk0jHTZEamB8
+               TXT     v=spf1 +a +mx -all
+
 uppercase      TXT     v=sPf1 +all
 
 ; Alias A record for the local host, under the name "server1"

diff --git a/test/scripts/4600-SPF/4601 b/test/scripts/4600-SPF/4601
index 6012cfdebd15b970fa7c78c564d32e507d0eedf2..72ef10d3f67ab6b299af015175ea492864d6510a 100644 (file)
--- a/test/scripts/4600-SPF/4601
+++ b/test/scripts/4600-SPF/4601
@@ -25,8 +25,13 @@ quit
 #
 killdaemon
 #
+# SERVFAIL -> temperror
 # A multiple spf-RR return should get permerror
+# - and not crash with non-spf txt records
+# v=spf1 is casr-insensitive
 exim -be
+${lookup {fred@test.again.dns} spf {HOSTIPV4}}
 ${lookup {fred@double.example.com} spf {8.8.8.8}}
+${lookup {fred@doubleplus.example.com} spf {8.8.8.8}}
 ${lookup {fred@uppercase.example.com} spf {HOSTIPV4}}
 ****