You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2022/05/28 10:38:26 UTC
svn commit: r1901346 [2/2] - /spamassassin/trunk/t/
Modified: spamassassin/trunk/t/spamd_sql_prefs.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_sql_prefs.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_sql_prefs.t (original)
+++ spamassassin/trunk/t/spamd_sql_prefs.t Sat May 28 10:38:25 2022
@@ -33,26 +33,26 @@ tstprefs ("
ok(start_spamd("-L --sql-config -u $spamd_run_as_user"));
%patterns = (
- q{ X-Spam-tTEST1: FOO1 }, 'Added Header tTEST1',
- q{ X-Spam-Flag: YES}, 'Spam Flag',
+ qr/^X-Spam-tTEST1: FOO1$/m, 'Added Header tTEST1',
+ qr/^X-Spam-Flag: YES/m, 'Spam Flag',
q{ 1000 GTUBE }, 'GTUBE Test',
- q{ XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X }, 'GTUBE String',
+ 'XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X', 'GTUBE String',
);
%anti_patterns = (
- q{ X-Spam-tTEST2: FOO2 }, 'Added Header',
+ 'X-Spam-tTEST2: FOO2', 'Added Header',
);
ok (spamcrun("-u nobody < data/spam/018", \&patterns_run_cb));
ok_all_patterns();
clear_pattern_counters();
%patterns = (
- q{ X-Spam-tTEST1: FOO1 }, 'Added Header tTEST1',
- q{ X-Spam-tTEST2: FOO2 }, 'Added Header tTEST2',
- q{ XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X }, 'GTUBE String',
+ qr/^X-Spam-tTEST1: FOO1$/m, 'Added Header tTEST1',
+ qr/^X-Spam-tTEST2: FOO2$/m, 'Added Header tTEST2',
+ 'XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X', 'GTUBE String',
);
%anti_patterns = (
q{ 1000 GTUBE }, 'GTUBE Test',
- q{ X-Spam-Flag: YES}, 'Spam Flag',
+ 'X-Spam-Flag: YES', 'Spam Flag',
);
ok (spamcrun("-u testuser < data/spam/018", \&patterns_run_cb));
ok_all_patterns();
@@ -61,13 +61,13 @@ clear_pattern_counters();
ok($dbh->do("INSERT INTO userpref VALUES('testuser', 'required_score', '1000')"));
%patterns = (
- q{ X-Spam-tTEST1: FOO1 }, 'Added Header tTEST1',
- q{ X-Spam-tTEST2: FOO2 }, 'Added Header tTEST2',
- q{ X-Spam-Status: No }, 'Spam Status No',
- q{ XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X }, 'GTUBE String',
+ qr/^X-Spam-tTEST1: FOO1\n/m, 'Added Header tTEST1',
+ qr/^X-Spam-tTEST2: FOO2\n/m, 'Added Header tTEST2',
+ qr/^X-Spam-Status: No/m, 'Spam Status No',
+ 'XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X', 'GTUBE String',
);
%anti_patterns = (
- q{ X-Spam-Flag: YES}, 'Spam Flag YES',
+ 'X-Spam-Flag: YES', 'Spam Flag YES',
q{ 1000 GTUBE }, 'GTUBE Test',
);
ok (spamcrun("-u testuser < data/spam/018", \&patterns_run_cb));
Modified: spamassassin/trunk/t/spamd_symbols.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_symbols.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_symbols.t (original)
+++ spamassassin/trunk/t/spamd_symbols.t Sat May 28 10:38:25 2022
@@ -10,8 +10,8 @@ plan tests => 3;
# ---------------------------------------------------------------------------
%patterns = (
- q{ TEST_ENDSNUMS, }, 'endsinnums',
- q{ TEST_NOREALNAME, }, 'noreal',
+ ',TEST_ENDSNUMS,', 'endsinnums',
+ ',TEST_NOREALNAME,', 'noreal',
);
ok (sdrun ("-L", "-y < data/spam/001", \&patterns_run_cb));
Modified: spamassassin/trunk/t/spamd_user_rules_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_user_rules_leak.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_user_rules_leak.t (original)
+++ spamassassin/trunk/t/spamd_user_rules_leak.t Sat May 28 10:38:25 2022
@@ -6,7 +6,7 @@ use SATest; sa_t_init("spamd_user_rules_
use Test::More;
plan skip_all => 'Spamd tests disabled' if $SKIP_SPAMD_TESTS;
-plan tests => 28;
+plan tests => 20;
# ---------------------------------------------------------------------------
# If user A defines a user rule (when allow_user_rules is enabled) it affects
@@ -59,13 +59,13 @@ print OUT q{
close OUT;
%patterns = (
- q{ 3.0 MYFOO }, 'MYFOO',
- q{ 3.0 MYBODY }, 'MYBODY',
- q{ 3.0 MYRAWBODY }, 'MYRAWBODY',
- q{ 3.0 MYFULL }, 'MYFULL',
+ q{ 3.0 MYFOO }, '',
+ q{ 3.0 MYBODY }, '',
+ q{ 3.0 MYRAWBODY }, '',
+ q{ 3.0 MYFULL }, '',
);
%anti_patterns = (
- q{ redefined at }, 'redefined_errors_in_spamd_log',
+ 'redefined at', 'redefined_errors_in_spamd_log',
);
# use -m1 so all scans use the same child
@@ -75,17 +75,13 @@ ok_all_patterns();
clear_pattern_counters();
%patterns = (
- q{ does not include a real name }, 'TEST_NOREALNAME',
+ q{ does not include a real name }, '',
);
%anti_patterns = (
- q{ 1.0 MYFOO }, 'MYFOO',
- q{ 1.0 MYBODY }, 'MYBODY',
- q{ 1.0 MYRAWBODY }, 'MYRAWBODY',
- q{ 1.0 MYFULL }, 'MYFULL',
- q{ 3.0 MYFOO }, 'MYFOO',
- q{ 3.0 MYBODY }, 'MYBODY',
- q{ 3.0 MYRAWBODY }, 'MYRAWBODY',
- q{ 3.0 MYFULL }, 'MYFULL',
+ qr/\d MYFOO /, '',
+ qr/\d MYBODY /, '',
+ qr/\d MYRAWBODY /, '',
+ qr/\d MYFULL /, '',
);
ok (spamcrun ("-u testuser2 < data/spam/009", \&patterns_run_cb));
checkfile ($spamd_stderr, \&patterns_run_cb);
@@ -93,17 +89,13 @@ ok_all_patterns();
clear_pattern_counters();
%patterns = (
- q{ does not include a real name }, 'TEST_NOREALNAME',
+ q{ does not include a real name }, '',
);
%anti_patterns = (
- q{ 1.0 MYFOO }, 'MYFOO',
- q{ 1.0 MYBODY }, 'MYBODY',
- q{ 1.0 MYRAWBODY }, 'MYRAWBODY',
- q{ 1.0 MYFULL }, 'MYFULL',
- q{ 3.0 MYFOO }, 'MYFOO',
- q{ 3.0 MYBODY }, 'MYBODY',
- q{ 3.0 MYRAWBODY }, 'MYRAWBODY',
- q{ 3.0 MYFULL }, 'MYFULL',
+ qr/\d MYFOO /, '',
+ qr/\d MYBODY /, '',
+ qr/\d MYRAWBODY /, '',
+ qr/\d MYFULL /, '',
);
ok (spamcrun ("-u testuser3 < data/spam/009", \&patterns_run_cb));
ok (stop_spamd ());
Modified: spamassassin/trunk/t/spamd_welcomelist_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_welcomelist_leak.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_welcomelist_leak.t (original)
+++ spamassassin/trunk/t/spamd_welcomelist_leak.t Sat May 28 10:38:25 2022
@@ -35,8 +35,8 @@ print OUT '';
close OUT;
%patterns = (
- q{ 99 MYBODY }, 'MYBODY',
- q{-100 USER_IN_WELCOMELIST }, 'USER_IN_WELCOMELIST',
+ q{ 99 MYBODY }, '',
+ q{ -100 USER_IN_WELCOMELIST }, '',
);
%anti_patterns = (
);
@@ -48,10 +48,10 @@ ok_all_patterns();
clear_pattern_counters();
%patterns = (
- q{ 99 MYBODY }, 'MYBODY',
+ q{ 99 MYBODY }, '',
);
%anti_patterns = (
- q{ 0 USER_IN_WELCOMELIST }, 'USER_IN_WELCOMELIST',
+ qr/\d USER_IN_WELCOMELIST /, '',
);
ok (spamcrun ("-u testuser2 < data/spam/001", \&patterns_run_cb));
checkfile ($spamd_stderr, \&patterns_run_cb);
Modified: spamassassin/trunk/t/spamd_whitelist_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_whitelist_leak.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_whitelist_leak.t (original)
+++ spamassassin/trunk/t/spamd_whitelist_leak.t Sat May 28 10:38:25 2022
@@ -40,8 +40,8 @@ print OUT '';
close OUT;
%patterns = (
- q{ 99 MYBODY }, 'MYBODY',
- q{-100 USER_IN_WHITELIST }, 'USER_IN_WHITELIST',
+ q{ 99 MYBODY }, '',
+ q{ -100 USER_IN_WHITELIST }, '',
);
%anti_patterns = (
);
@@ -53,10 +53,10 @@ ok_all_patterns();
clear_pattern_counters();
%patterns = (
- q{ 99 MYBODY }, 'MYBODY',
+ q{ 99 MYBODY }, '',
);
%anti_patterns = (
- q{ 0 USER_IN_WHITELIST }, 'USER_IN_WHITELIST',
+ q{ -100 USER_IN_WHITELIST }, '',
);
ok (spamcrun ("-u testuser2 < data/spam/001", \&patterns_run_cb));
checkfile ($spamd_stderr, \&patterns_run_cb);
Modified: spamassassin/trunk/t/spf.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spf.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/spf.t (original)
+++ spamassassin/trunk/t/spf.t Sat May 28 10:38:25 2022
@@ -55,31 +55,31 @@ tstlocalrules ("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf1", \&patterns_run_cb);
ok_all_patterns();
%patterns = (
- q{ SPF_NEUTRAL }, 'neutral',
- q{ SPF_HELO_NEUTRAL }, 'helo_neutral',
+ q{ 0.0 SPF_NEUTRAL }, 'neutral',
+ q{ 0.0 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',
+ q{ 0.0 SPF_SOFTFAIL }, 'softfail',
+ q{ 0.0 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',
+ q{ 0.0 SPF_FAIL }, 'fail',
+ q{ 0.0 SPF_HELO_FAIL }, 'helo_fail',
);
sarun ("-t < data/spam/spf3", \&patterns_run_cb);
@@ -98,8 +98,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf2", \&patterns_run_cb);
@@ -117,8 +117,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf2", \&patterns_run_cb);
@@ -138,8 +138,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_NEUTRAL }, 'helo_neutral',
- q{ SPF_NEUTRAL }, 'neutral',
+ q{ 0.0 SPF_HELO_NEUTRAL }, 'helo_neutral',
+ q{ 0.0 SPF_NEUTRAL }, 'neutral',
);
if (0) {
@@ -162,8 +162,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf2", \&patterns_run_cb);
@@ -182,8 +182,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf2", \&patterns_run_cb);
@@ -230,8 +230,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf2", \&patterns_run_cb);
@@ -251,8 +251,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf3", \&patterns_run_cb);
@@ -272,8 +272,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_FAIL }, 'helo_fail',
- q{ SPF_FAIL }, 'fail',
+ q{ 0.0 SPF_HELO_FAIL }, 'helo_fail',
+ q{ 0.0 SPF_FAIL }, 'fail',
);
sarun ("-t < data/nice/spf3", \&patterns_run_cb);
@@ -293,8 +293,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_SOFTFAIL }, 'helo_softfail',
- q{ SPF_SOFTFAIL }, 'softfail',
+ q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail',
+ q{ 0.0 SPF_SOFTFAIL }, 'softfail',
);
sarun ("-t < data/nice/spf3", \&patterns_run_cb);
@@ -314,8 +314,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_NEUTRAL }, 'helo_neutral',
- q{ SPF_NEUTRAL }, 'neutral',
+ q{ 0.0 SPF_HELO_NEUTRAL }, 'helo_neutral',
+ q{ 0.0 SPF_NEUTRAL }, 'neutral',
);
sarun ("-t < data/nice/spf3", \&patterns_run_cb);
@@ -330,10 +330,10 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
- q{ USER_IN_SPF_WHITELIST }, 'spf_whitelist',
- q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
+ q{ -0.0 USER_IN_SPF_WHITELIST }, 'spf_whitelist',
+ q{ -0.0 USER_IN_DEF_SPF_WL }, 'default_spf_whitelist',
);
sarun ("-t < data/nice/spf1", \&patterns_run_cb);
@@ -348,8 +348,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
%anti_patterns = (
@@ -373,10 +373,10 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
- q{ USER_IN_SPF_WHITELIST }, 'spf_whitelist',
- q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
+ q{ -0.0 USER_IN_SPF_WHITELIST }, 'spf_whitelist',
+ q{ -0.0 USER_IN_DEF_SPF_WL }, 'default_spf_whitelist',
);
sarun ("-t < data/nice/spf1", \&patterns_run_cb);
@@ -396,8 +396,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb);
@@ -427,8 +427,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_FAIL }, 'helo_fail_ignore_header',
- q{ SPF_FAIL }, 'fail_ignore_header',
+ q{ 0.0 SPF_HELO_FAIL }, 'helo_fail_ignore_header',
+ q{ 0.0 SPF_FAIL }, 'fail_ignore_header',
);
sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb);
@@ -451,8 +451,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header',
- q{ SPF_NEUTRAL }, 'neutral_from_header',
+ q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header',
+ q{ 0.0 SPF_NEUTRAL }, 'neutral_from_header',
);
sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb);
@@ -476,8 +476,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header',
- q{ SPF_FAIL }, 'fail_from_header',
+ q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header',
+ q{ 0.0 SPF_FAIL }, 'fail_from_header',
);
sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb);
@@ -500,8 +500,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
%anti_patterns = (
Modified: spamassassin/trunk/t/spf_welcome_block.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spf_welcome_block.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/spf_welcome_block.t (original)
+++ spamassassin/trunk/t/spf_welcome_block.t Sat May 28 10:38:25 2022
@@ -52,31 +52,31 @@ tstlocalrules ("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf1", \&patterns_run_cb);
ok_all_patterns();
%patterns = (
- q{ SPF_NEUTRAL }, 'neutral',
- q{ SPF_HELO_NEUTRAL }, 'helo_neutral',
+ q{ 0.0 SPF_NEUTRAL }, 'neutral',
+ q{ 0.0 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',
+ q{ 0.0 SPF_SOFTFAIL }, 'softfail',
+ q{ 0.0 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',
+ q{ 0.0 SPF_FAIL }, 'fail',
+ q{ 0.0 SPF_HELO_FAIL }, 'helo_fail',
);
sarun ("-t < data/spam/spf3", \&patterns_run_cb);
@@ -95,8 +95,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf2", \&patterns_run_cb);
@@ -114,8 +114,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf2", \&patterns_run_cb);
@@ -135,8 +135,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_NEUTRAL }, 'helo_neutral',
- q{ SPF_NEUTRAL }, 'neutral',
+ q{ 0.0 SPF_HELO_NEUTRAL }, 'helo_neutral',
+ q{ 0.0 SPF_NEUTRAL }, 'neutral',
);
if (0) {
@@ -159,8 +159,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf2", \&patterns_run_cb);
@@ -179,8 +179,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf2", \&patterns_run_cb);
@@ -227,8 +227,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf2", \&patterns_run_cb);
@@ -248,8 +248,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf3", \&patterns_run_cb);
@@ -269,8 +269,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_FAIL }, 'helo_fail',
- q{ SPF_FAIL }, 'fail',
+ q{ 0.0 SPF_HELO_FAIL }, 'helo_fail',
+ q{ 0.0 SPF_FAIL }, 'fail',
);
sarun ("-t < data/nice/spf3", \&patterns_run_cb);
@@ -290,8 +290,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_SOFTFAIL }, 'helo_softfail',
- q{ SPF_SOFTFAIL }, 'softfail',
+ q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail',
+ q{ 0.0 SPF_SOFTFAIL }, 'softfail',
);
sarun ("-t < data/nice/spf3", \&patterns_run_cb);
@@ -311,8 +311,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_NEUTRAL }, 'helo_neutral',
- q{ SPF_NEUTRAL }, 'neutral',
+ q{ 0.0 SPF_HELO_NEUTRAL }, 'helo_neutral',
+ q{ 0.0 SPF_NEUTRAL }, 'neutral',
);
sarun ("-t < data/nice/spf3", \&patterns_run_cb);
@@ -327,10 +327,10 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
- q{ USER_IN_SPF_WELCOMELIST }, 'spf_whitelist',
- q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
+ q{ -0.0 USER_IN_SPF_WELCOMELIST }, 'spf_whitelist',
+ q{ -0.0 USER_IN_DEF_SPF_WL }, 'default_spf_whitelist',
);
sarun ("-t < data/nice/spf1", \&patterns_run_cb);
@@ -345,8 +345,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
%anti_patterns = (
@@ -370,10 +370,10 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
- q{ USER_IN_SPF_WELCOMELIST }, 'spf_whitelist',
- q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
+ q{ -0.0 USER_IN_SPF_WELCOMELIST }, 'spf_whitelist',
+ q{ -0.0 USER_IN_DEF_SPF_WL }, 'default_spf_whitelist',
);
sarun ("-t < data/nice/spf1", \&patterns_run_cb);
@@ -393,8 +393,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb);
@@ -424,8 +424,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_FAIL }, 'helo_fail_ignore_header',
- q{ SPF_FAIL }, 'fail_ignore_header',
+ q{ 0.0 SPF_HELO_FAIL }, 'helo_fail_ignore_header',
+ q{ 0.0 SPF_FAIL }, 'fail_ignore_header',
);
sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb);
@@ -448,8 +448,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header',
- q{ SPF_NEUTRAL }, 'neutral_from_header',
+ q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header',
+ q{ 0.0 SPF_NEUTRAL }, 'neutral_from_header',
);
sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb);
@@ -473,8 +473,8 @@ tstprefs("
%anti_patterns = ();
%patterns = (
- q{ SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header',
- q{ SPF_FAIL }, 'fail_from_header',
+ q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header',
+ q{ 0.0 SPF_FAIL }, 'fail_from_header',
);
sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb);
@@ -497,8 +497,8 @@ tstprefs("
");
%patterns = (
- q{ SPF_HELO_PASS }, 'helo_pass',
- q{ SPF_PASS }, 'pass',
+ q{ -0.0 SPF_HELO_PASS }, 'helo_pass',
+ q{ -0.0 SPF_PASS }, 'pass',
);
%anti_patterns = (
Modified: spamassassin/trunk/t/sql_based_welcomelist.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sql_based_welcomelist.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/sql_based_welcomelist.t (original)
+++ spamassassin/trunk/t/sql_based_welcomelist.t Sat May 28 10:38:25 2022
@@ -90,13 +90,13 @@ if (SQL) {
sub run_awl {
%is_nonspam_patterns = (
- q{ Subject: Re: [SAtalk] auto-whitelisting}, 'subj',
+ ' Subject: Re: [SAtalk] auto-whitelisting', 'subj',
);
%is_spam_patterns = (
- q{Subject: 4000 Your Vacation Winning !}, 'subj',
+ 'Subject: 4000 Your Vacation Winning !', 'subj',
);
%is_spam_patterns2 = (
- q{ X-Spam-Status: Yes}, 'status',
+ ' X-Spam-Status: Yes', 'status',
);
%patterns = %is_nonspam_patterns;
@@ -104,37 +104,37 @@ ok(sarun ("--remove-addr-from-welcomelis
# 3 times, to get into the welcomelist: # verify correct ip/score/msgcount from debug output
%patterns = (%is_nonspam_patterns,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores 0, msgcount 0'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores 0, msgcount 0' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_nonspam_patterns,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -1.2, msgcount 1'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -1.2, msgcount 1' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_nonspam_patterns,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -2.4, msgcount 2'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -2.4, msgcount 2' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
# Now check
%patterns = (%is_nonspam_patterns,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -3.6, msgcount 3'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -3.6, msgcount 3' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_spam_patterns,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -4.8, msgcount 4'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -4.8, msgcount 4' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb));
ok_all_patterns();
# Should be raised after last spam
%patterns = (%is_spam_patterns,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores 0.7, msgcount 5'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores 0.7, msgcount 5' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_spam_patterns2,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|210.73 scores 0, msgcount 0'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|210.73 scores 0, msgcount 0' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/spam/007 2>&1", \&patterns_run_cb));
ok_all_patterns();
Modified: spamassassin/trunk/t/sql_based_whitelist.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sql_based_whitelist.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/sql_based_whitelist.t (original)
+++ spamassassin/trunk/t/sql_based_whitelist.t Sat May 28 10:38:25 2022
@@ -90,13 +90,13 @@ if (SQL) {
sub run_awl {
%is_nonspam_patterns = (
- q{ Subject: Re: [SAtalk] auto-whitelisting}, 'subj',
+ ' Subject: Re: [SAtalk] auto-whitelisting', 'subj',
);
%is_spam_patterns = (
- q{Subject: 4000 Your Vacation Winning !}, 'subj',
+ 'Subject: 4000 Your Vacation Winning !', 'subj',
);
%is_spam_patterns2 = (
- q{ X-Spam-Status: Yes}, 'status',
+ ' X-Spam-Status: Yes', 'status',
);
%patterns = %is_nonspam_patterns;
@@ -104,37 +104,37 @@ ok(sarun ("--remove-addr-from-whitelist
# 3 times, to get into the whitelist: # verify correct ip/score/msgcount from debug output
%patterns = (%is_nonspam_patterns,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores 0, msgcount 0'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores 0, msgcount 0' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_nonspam_patterns,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -1.2, msgcount 1'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -1.2, msgcount 1' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_nonspam_patterns,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -2.4, msgcount 2'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -2.4, msgcount 2' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
# Now check
%patterns = (%is_nonspam_patterns,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -3.6, msgcount 3'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -3.6, msgcount 3' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_spam_patterns,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -4.8, msgcount 4'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -4.8, msgcount 4' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb));
ok_all_patterns();
# Should be raised after last spam
%patterns = (%is_spam_patterns,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores 0.7, msgcount 5'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores 0.7, msgcount 5' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_spam_patterns2,
- (q{'sql-based whitelist_test@whitelist.spamassassin.taint.org|210.73 scores 0, msgcount 0'} => 'scores'));
+ ('sql-based whitelist_test@whitelist.spamassassin.taint.org|210.73 scores 0, msgcount 0' => 'scores'));
ok(sarun ("-L -t -D auto-welcomelist < data/spam/007 2>&1", \&patterns_run_cb));
ok_all_patterns();
Modified: spamassassin/trunk/t/stripmarkup.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/stripmarkup.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/stripmarkup.t (original)
+++ spamassassin/trunk/t/stripmarkup.t Sat May 28 10:38:25 2022
@@ -7,18 +7,9 @@ use Test::More tests => 4;
# ---------------------------------------------------------------------------
%patterns = (
-
-q{ Content-Type: text/html }, 'contenttype',
-
-q{
- Sender: pertand@email.mondolink.com
- Content-Type: text/html
-
- <HTML></P>
- }, 'startofbody',
-
-q{Subject: "100% HERBALSENSATION"}, 'subj',
-
+ qr/^Content-Type: text\/html$/m, 'contenttype',
+ qr/\nSender: pertand\@email\.mondolink\.com\nContent-Type: text\/html\n\n<HTML><\/P>/, 'startofbody',
+ qr/^Subject: "100% HERBALSENSATION"$/m, 'subj',
);
tstprefs ( "
Modified: spamassassin/trunk/t/text_bad_ctype.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/text_bad_ctype.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/text_bad_ctype.t (original)
+++ spamassassin/trunk/t/text_bad_ctype.t Sat May 28 10:38:25 2022
@@ -10,7 +10,7 @@ tstlocalrules ('
body NATURAL /\btotally <br> natural/i
');
-%patterns = ( q{ NATURAL } => 'NATURAL',);
+%patterns = ( q{ 1.0 NATURAL } => 'NATURAL',);
%anti_patterns = ();
sarun ("-L -t < data/spam/badctype1", \&patterns_run_cb);
ok_all_patterns();
Modified: spamassassin/trunk/t/uribl.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/uribl.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/uribl.t (original)
+++ spamassassin/trunk/t/uribl.t Sat May 28 10:38:25 2022
@@ -25,7 +25,7 @@ plan tests => 10 * $iterations;
);
%anti_patterns = (
- q{ 1.0 X_URIBL_FULL_NS } => '',
+ q{ X_URIBL_FULL_NS } => '',
);
tstlocalrules(q{
Modified: spamassassin/trunk/t/uribl_domains_only.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/uribl_domains_only.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/uribl_domains_only.t (original)
+++ spamassassin/trunk/t/uribl_domains_only.t Sat May 28 10:38:25 2022
@@ -31,7 +31,7 @@ tstlocalrules(q{
ok sarun ("-t < data/spam/dnsbl_domsonly.eml 2>&1", \&patterns_run_cb);
ok_all_patterns();
-%patterns = ( q{ X_URIBL_DOMSONLY } => 'A' );
+%patterns = ( q{ 1.0 X_URIBL_DOMSONLY } => 'A' );
%anti_patterns = ();
clear_pattern_counters();
Modified: spamassassin/trunk/t/uribl_ips_only.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/uribl_ips_only.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/uribl_ips_only.t (original)
+++ spamassassin/trunk/t/uribl_ips_only.t Sat May 28 10:38:25 2022
@@ -31,7 +31,7 @@ tstlocalrules(q{
ok sarun ("-t < data/spam/dnsbl_ipsonly.eml 2>&1", \&patterns_run_cb);
ok_all_patterns();
-%patterns = ( q{ X_URIBL_IPSONLY } => 'A' );
+%patterns = ( q{ 1.0 X_URIBL_IPSONLY } => 'A' );
%anti_patterns = ();
clear_pattern_counters();
Modified: spamassassin/trunk/t/welcomelist_from.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/welcomelist_from.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/welcomelist_from.t (original)
+++ spamassassin/trunk/t/welcomelist_from.t Sat May 28 10:38:25 2022
@@ -31,13 +31,13 @@ tstprefs ("
# tests 1 - 4 does welcomelist_from work?
%patterns = (
- q{ USER_IN_WELCOMELIST }, 'w1'
+ q{ -100 USER_IN_WELCOMELIST }, '',
);
%anti_patterns = (
- q{ FORGED_IN_WELCOMELIST }, 'a2',
- q{ USER_IN_DEF_WELCOMELIST }, 'a3',
- q{ FORGED_IN_DEF_WELCOMELIST }, 'a4'
+ q{ FORGED_IN_WELCOMELIST }, '',
+ q{ USER_IN_DEF_WELCOMELIST }, '',
+ q{ FORGED_IN_DEF_WELCOMELIST }, '',
);
sarun ("-L -t < data/nice/008", \&patterns_run_cb);
ok_all_patterns();
@@ -51,13 +51,13 @@ sarun ("-L -t < data/nice/010", \&patter
ok_all_patterns();
%patterns = (
- q{ USER_IN_DEF_WELCOMELIST }, 'w5'
+ q{ -15 USER_IN_DEF_WELCOMELIST }, '',
);
%anti_patterns = (
- q{ 0 USER_IN_WELCOMELIST }, 'a6',
- q{ FORGED_IN_WELCOMELIST }, 'a7',
- q{ FORGED_IN_DEF_WELCOMELIST }, 'a8'
+ q{ USER_IN_WELCOMELIST }, '',
+ q{ FORGED_IN_WELCOMELIST }, '',
+ q{ FORGED_IN_DEF_WELCOMELIST }, '',
);
# tests 13 - 16 does def_welcomelist_from_rcvd work?
@@ -71,10 +71,10 @@ ok_all_patterns();
%patterns = ();
%anti_patterns = (
- q{ 0 USER_IN_WELCOMELIST }, 'a9',
- q{ FORGED_IN_WELCOMELIST }, 'a10',
- q{ USER_IN_DEF_WELCOMELIST }, 'a11',
- q{ FORGED_IN_DEF_WELCOMELIST }, 'a12'
+ q{ USER_IN_WELCOMELIST }, '',
+ q{ FORGED_IN_WELCOMELIST }, '',
+ q{ USER_IN_DEF_WELCOMELIST }, '',
+ q{ FORGED_IN_DEF_WELCOMELIST }, '',
);
# tests 21 - 24 does welcomelist_allows_relays suppress the forged rule without
# putting the address on the welcomelist?
Modified: spamassassin/trunk/t/whitelist_from.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_from.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_from.t (original)
+++ spamassassin/trunk/t/whitelist_from.t Sat May 28 10:38:25 2022
@@ -39,13 +39,13 @@ tstprefs ("
# tests 1 - 4 does whitelist_from work?
%patterns = (
- q{ USER_IN_WHITELIST }, 'w1'
+ q{ -100 USER_IN_WHITELIST }, '',
);
%anti_patterns = (
- q{ FORGED_IN_WHITELIST }, 'a2',
- q{ USER_IN_DEF_WHITELIST }, 'a3',
- q{ FORGED_IN_DEF_WHITELIST }, 'a4'
+ q{ FORGED_IN_WHITELIST }, '',
+ q{ USER_IN_DEF_WHITELIST }, '',
+ q{ FORGED_IN_DEF_WHITELIST }, '',
);
sarun ("-L -t < data/nice/008", \&patterns_run_cb);
ok_all_patterns();
@@ -59,13 +59,13 @@ sarun ("-L -t < data/nice/010", \&patter
ok_all_patterns();
%patterns = (
- q{ USER_IN_DEF_WHITELIST }, 'w5'
+ q{ -15 USER_IN_DEF_WHITELIST }, '',
);
%anti_patterns = (
- q{ USER_IN_WHITELIST }, 'a6',
- q{ FORGED_IN_WHITELIST }, 'a7',
- q{ FORGED_IN_DEF_WHITELIST }, 'a8'
+ q{ USER_IN_WHITELIST }, '',
+ q{ FORGED_IN_WHITELIST }, '',
+ q{ FORGED_IN_DEF_WHITELIST }, '',
);
# tests 13 - 16 does def_whitelist_from_rcvd work?
@@ -79,10 +79,10 @@ ok_all_patterns();
%patterns = ();
%anti_patterns = (
- q{ USER_IN_WHITELIST }, 'a9',
- q{ FORGED_IN_WHITELIST }, 'a10',
- q{ USER_IN_DEF_WHITELIST }, 'a11',
- q{ FORGED_IN_DEF_WHITELIST }, 'a12'
+ q{ USER_IN_WHITELIST }, '',
+ q{ FORGED_IN_WHITELIST }, '',
+ q{ USER_IN_DEF_WHITELIST }, '',
+ q{ FORGED_IN_DEF_WHITELIST }, '',
);
# tests 21 - 24 does whitelist_allows_relays suppress the forged rule without
# putting the address on the whitelist?
Modified: spamassassin/trunk/t/wlbl_uri.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/wlbl_uri.t?rev=1901346&r1=1901345&r2=1901346&view=diff
==============================================================================
--- spamassassin/trunk/t/wlbl_uri.t (original)
+++ spamassassin/trunk/t/wlbl_uri.t Sat May 28 10:38:25 2022
@@ -59,10 +59,10 @@ END
disable_compat "welcomelist_blocklist";
%patterns = (
- q{ 0.0 URI_HOST_IN_BLOCKLIST }, 'hit-blo',
- q{ 100 URI_HOST_IN_BLACKLIST }, 'hit-bla',
- q{ -0.0 URI_HOST_IN_WELCOMELIST }, 'hit-wel',
- q{ -100 URI_HOST_IN_WHITELIST }, 'hit-whi',
+ q{ 0.0 URI_HOST_IN_BLOCKLIST }, '',
+ q{ 100 URI_HOST_IN_BLACKLIST }, '',
+ q{ -0.0 URI_HOST_IN_WELCOMELIST }, '',
+ q{ -100 URI_HOST_IN_WHITELIST }, '',
);
###
@@ -88,12 +88,12 @@ ok_all_patterns();
###
%patterns = (
- q{ 100 URI_HOST_IN_BLOCKLIST }, 'hit-blo',
- q{ -100 URI_HOST_IN_WELCOMELIST }, 'hit-wel',
+ q{ 100 URI_HOST_IN_BLOCKLIST }, '',
+ q{ -100 URI_HOST_IN_WELCOMELIST }, '',
);
%anti_patterns = (
- q{ URI_HOST_IN_BLACKLIST }, 'hit-bla',
- q{ URI_HOST_IN_WHITELIST }, 'hit-whi',
+ q{ URI_HOST_IN_BLACKLIST }, '',
+ q{ URI_HOST_IN_WHITELIST }, '',
);
tstpre("