You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2005/04/29 12:32:21 UTC
svn commit: r165289 - in /spamassassin/trunk/t: data/spam/spf1
data/spam/spf2 data/spam/spf3 spf.t
Author: sidney
Date: Fri Apr 29 03:32:17 2005
New Revision: 165289
URL: http://svn.apache.org/viewcvs?rev=165289&view=rev
Log:
bug 4269 and update spf tests to cover all spf replies
Added:
spamassassin/trunk/t/data/spam/spf2 (with props)
spamassassin/trunk/t/data/spam/spf3 (with props)
Modified:
spamassassin/trunk/t/data/spam/spf1
spamassassin/trunk/t/spf.t
Modified: spamassassin/trunk/t/data/spam/spf1
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/data/spam/spf1?rev=165289&r1=165288&r2=165289&view=diff
==============================================================================
--- spamassassin/trunk/t/data/spam/spf1 (original)
+++ spamassassin/trunk/t/data/spam/spf1 Fri Apr 29 03:32:17 2005
@@ -1,5 +1,5 @@
Return-Path: <ne...@dnsbltest.spamassassin.org>
-Received: from bugzilla.spamassassin.org (bugzilla.spamassassin.org [65.214.43.155]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: from bugzilla.spamassassin.org (bugzilla.spamassassin.org [65.214.43.157]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
Received: by proxy.google.com with SMTP id so1951389 for <jm...@jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
Message-ID: <10...@persist.google.com>
Added: spamassassin/trunk/t/data/spam/spf2
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/data/spam/spf2?rev=165289&view=auto
==============================================================================
--- spamassassin/trunk/t/data/spam/spf2 (added)
+++ spamassassin/trunk/t/data/spam/spf2 Fri Apr 29 03:32:17 2005
@@ -0,0 +1,22 @@
+Return-Path: <ne...@dnsbltest.spamassassin.org>
+Received: from bugzilla.spamassassin.org (bugzilla.spamassassin.org [65.214.43.156]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: by proxy.google.com with SMTP id so1951389 for <jm...@jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Message-ID: <10...@persist.google.com>
+Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+From: newsalerts-noreply@dnsbltest.spamassassin.org
+To: jm-google-news-alerts@jmason.org
+Subject: Google News Alert - spamassassin
+MIME-Version: 1.0
+Content-Type: text/plain; charset="ISO-8859-1";
+
+SWSOFT Unveils Plesk 7, Deployed by 1&1
+Web Host Industry Review - USA
+... The software also features a newly designed Windows XP-like user interface,
+is equipped SpamAssassin, an open source anti-spam tool, and includes
+"Application ...
+<http://thewhir.com/marketwatch/sws021004.cfm>
+See all stories on this topic:
+<http://news.google.com/news?hl=en&lr=&ie=UTF-8&oe=utf8&client=google&num=30&newsc
+lusterurl=http://thewhir.com/marketwatch/sws021004.cfm>
+
Propchange: spamassassin/trunk/t/data/spam/spf2
------------------------------------------------------------------------------
svn:executable = *
Added: spamassassin/trunk/t/data/spam/spf3
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/data/spam/spf3?rev=165289&view=auto
==============================================================================
--- spamassassin/trunk/t/data/spam/spf3 (added)
+++ spamassassin/trunk/t/data/spam/spf3 Fri Apr 29 03:32:17 2005
@@ -0,0 +1,22 @@
+Return-Path: <ne...@dnsbltest.spamassassin.org>
+Received: from bugzilla.spamassassin.org (bugzilla.spamassassin.org [65.214.43.155]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: by proxy.google.com with SMTP id so1951389 for <jm...@jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Message-ID: <10...@persist.google.com>
+Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+From: newsalerts-noreply@dnsbltest.spamassassin.org
+To: jm-google-news-alerts@jmason.org
+Subject: Google News Alert - spamassassin
+MIME-Version: 1.0
+Content-Type: text/plain; charset="ISO-8859-1";
+
+SWSOFT Unveils Plesk 7, Deployed by 1&1
+Web Host Industry Review - USA
+... The software also features a newly designed Windows XP-like user interface,
+is equipped SpamAssassin, an open source anti-spam tool, and includes
+"Application ...
+<http://thewhir.com/marketwatch/sws021004.cfm>
+See all stories on this topic:
+<http://news.google.com/news?hl=en&lr=&ie=UTF-8&oe=utf8&client=google&num=30&newsc
+lusterurl=http://thewhir.com/marketwatch/sws021004.cfm>
+
Propchange: spamassassin/trunk/t/data/spam/spf3
------------------------------------------------------------------------------
svn:executable = *
Modified: spamassassin/trunk/t/spf.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/spf.t?rev=165289&r1=165288&r2=165289&view=diff
==============================================================================
--- spamassassin/trunk/t/spf.t (original)
+++ spamassassin/trunk/t/spf.t Fri Apr 29 03:32:17 2005
@@ -19,7 +19,7 @@
BEGIN {
- plan tests => (DO_RUN ? 4 : 0);
+ plan tests => (DO_RUN ? 8 : 0);
};
@@ -36,9 +36,24 @@
ok_all_patterns();
%patterns = (
- q{ SPF_HELO_FAIL }, 'helo_fail',
- q{ SPF_FAIL }, 'fail',
+ q{ SPF_NEUTRAL }, 'neutral',
+ q{ SPF_HELO_NEUTRAL }, 'helo_neutral',
);
sarun ("-t < data/spam/spf1", \&patterns_run_cb);
+ok_all_patterns();
+
+%patterns = (
+ q{ SPF_SOFTFAIL }, 'softfail',
+ q{ SPF_HELO_SOFTFAIL }, 'helo_softfail',
+);
+
+sarun ("-t < data/spam/spf2", \&patterns_run_cb);
+ok_all_patterns();
+%patterns = (
+ q{ SPF_FAIL }, 'fail',
+ q{ SPF_HELO_FAIL }, 'helo_fail',
+);
+
+sarun ("-t < data/spam/spf3", \&patterns_run_cb);
ok_all_patterns();