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 2018/10/29 12:03:00 UTC
svn commit: r1845107 - in /spamassassin: branches/3.4/lib/Mail/SpamAssassin/
branches/3.4/t/ trunk/lib/Mail/SpamAssassin/ trunk/t/
Author: hege
Date: Mon Oct 29 12:03:00 2018
New Revision: 1845107
URL: http://svn.apache.org/viewvc?rev=1845107&view=rev
Log:
Fix RB tests and case-i
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm
spamassassin/branches/3.4/t/dnsbl_subtests.t
spamassassin/branches/3.4/t/ip_addrs.t
spamassassin/branches/3.4/t/uri_text.t
spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm
spamassassin/trunk/t/dnsbl_subtests.t
spamassassin/trunk/t/ip_addrs.t
spamassassin/trunk/t/uri_text.t
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm?rev=1845107&r1=1845106&r2=1845107&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm Mon Oct 29 12:03:00 2018
@@ -54,7 +54,7 @@ sub new {
join('|', keys %{$self->{conf}->{valid_tlds}}).
'(?!(?:[a-zA-Z0-9-]|\.[a-zA-Z0-9]))'; # make sure it ends
# Perl 5.10+ trie optimizes lists, no need for fancy regex optimizing
- if (eval { $self->{valid_tlds_re} = qr/$tlds/; 1; }) {
+ if (eval { $self->{valid_tlds_re} = qr/$tlds/i; 1; }) {
dbg("config: registryboundaries: %d tlds loaded",
scalar keys %{$self->{conf}->{valid_tlds}});
} else {
Modified: spamassassin/branches/3.4/t/dnsbl_subtests.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/dnsbl_subtests.t?rev=1845107&r1=1845106&r2=1845107&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/dnsbl_subtests.t (original)
+++ spamassassin/branches/3.4/t/dnsbl_subtests.t Mon Oct 29 12:03:00 2018
@@ -332,9 +332,8 @@ if (!$pid) { # child
sleep 1;
$spamassassin_obj = Mail::SpamAssassin->new({
-# rules_filename => "$prefix/t/log/test_rules_copy",
-# require_rules => 1,
- rules_filename => "/dev/null",
+ rules_filename => "$prefix/t/log/test_rules_copy",
+ require_rules => 1,
site_rules_filename => "$prefix/t/log/localrules.tmp",
userprefs_filename => "$prefix/masses/spamassassin/user_prefs",
post_config_text => $local_conf,
Modified: spamassassin/branches/3.4/t/ip_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/ip_addrs.t?rev=1845107&r1=1845106&r2=1845107&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/ip_addrs.t (original)
+++ spamassassin/branches/3.4/t/ip_addrs.t Mon Oct 29 12:03:00 2018
@@ -23,8 +23,13 @@ use Mail::SpamAssassin;
use Mail::SpamAssassin::NetSet;
my $sa = Mail::SpamAssassin->new({
+ require_rules => 1,
+ site_rules_filename => "$prefix/t/log/localrules.tmp",
rules_filename => "$prefix/rules",
+ local_tests_only => 1,
+ dont_copy_prefs => 1,
});
+$sa->init(0);
sub tryone ($$) {
my ($pat, $testip) = @_;
Modified: spamassassin/branches/3.4/t/uri_text.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/uri_text.t?rev=1845107&r1=1845106&r2=1845107&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/uri_text.t (original)
+++ spamassassin/branches/3.4/t/uri_text.t Mon Oct 29 12:03:00 2018
@@ -20,13 +20,18 @@ if (-e 'test_dir') { # runnin
use strict;
use lib '.'; use lib 't';
use SATest; sa_t_init("uri_text");
-use Test::More tests => 683;
+use Test::More tests => 682;
use Mail::SpamAssassin;
use vars qw(%patterns %anti_patterns);
# initialize SpamAssassin
-my $sa = create_saobj({dont_copy_prefs => 1});
-
+my $sa = create_saobj({
+ require_rules => 1,
+ site_rules_filename => "$prefix/t/log/localrules.tmp",
+ rules_filename => "$prefix/rules",
+ local_tests_only => 1,
+ dont_copy_prefs => 1,
+});
$sa->init(0); # parse rules
# load tests and write mail
@@ -207,7 +212,6 @@ cmd.exe !cmd\.exe
commander !commander
aaacomaaa !aaacomaaa
-aaa.com.aaa !aaa\.com\.aaa
com.foo.web !com\.foo\.web
# IPs for www.yahoo.com
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm?rev=1845107&r1=1845106&r2=1845107&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm Mon Oct 29 12:03:00 2018
@@ -58,7 +58,7 @@ sub new {
join('|', keys %{$self->{conf}->{valid_tlds}}).
'(?!(?:[a-zA-Z0-9-]|\.[a-zA-Z0-9]))'; # make sure it ends
# Perl 5.10+ trie optimizes lists, no need for fancy regex optimizing
- if (eval { $self->{valid_tlds_re} = qr/$tlds/; 1; }) {
+ if (eval { $self->{valid_tlds_re} = qr/$tlds/i; 1; }) {
dbg("config: registryboundaries: %d tlds loaded",
scalar keys %{$self->{conf}->{valid_tlds}});
} else {
Modified: spamassassin/trunk/t/dnsbl_subtests.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/dnsbl_subtests.t?rev=1845107&r1=1845106&r2=1845107&view=diff
==============================================================================
--- spamassassin/trunk/t/dnsbl_subtests.t (original)
+++ spamassassin/trunk/t/dnsbl_subtests.t Mon Oct 29 12:03:00 2018
@@ -332,9 +332,8 @@ if (!$pid) { # child
sleep 1;
$spamassassin_obj = Mail::SpamAssassin->new({
-# rules_filename => "$prefix/t/log/test_rules_copy",
-# require_rules => 1,
- rules_filename => "/dev/null",
+ rules_filename => "$prefix/t/log/test_rules_copy",
+ require_rules => 1,
site_rules_filename => "$prefix/t/log/localrules.tmp",
userprefs_filename => "$prefix/masses/spamassassin/user_prefs",
post_config_text => $local_conf,
Modified: spamassassin/trunk/t/ip_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/ip_addrs.t?rev=1845107&r1=1845106&r2=1845107&view=diff
==============================================================================
--- spamassassin/trunk/t/ip_addrs.t (original)
+++ spamassassin/trunk/t/ip_addrs.t Mon Oct 29 12:03:00 2018
@@ -23,8 +23,13 @@ use Mail::SpamAssassin;
use Mail::SpamAssassin::NetSet;
my $sa = Mail::SpamAssassin->new({
+ require_rules => 1,
+ site_rules_filename => "$prefix/t/log/localrules.tmp",
rules_filename => "$prefix/rules",
+ local_tests_only => 1,
+ dont_copy_prefs => 1,
});
+$sa->init(0);
sub tryone ($$) {
my ($pat, $testip) = @_;
Modified: spamassassin/trunk/t/uri_text.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/uri_text.t?rev=1845107&r1=1845106&r2=1845107&view=diff
==============================================================================
--- spamassassin/trunk/t/uri_text.t (original)
+++ spamassassin/trunk/t/uri_text.t Mon Oct 29 12:03:00 2018
@@ -20,13 +20,18 @@ if (-e 'test_dir') { # runnin
use strict;
use lib '.'; use lib 't';
use SATest; sa_t_init("uri_text");
-use Test::More tests => 683;
+use Test::More tests => 682;
use Mail::SpamAssassin;
use vars qw(%patterns %anti_patterns);
# initialize SpamAssassin
-my $sa = create_saobj({dont_copy_prefs => 1});
-
+my $sa = create_saobj({
+ require_rules => 1,
+ site_rules_filename => "$prefix/t/log/localrules.tmp",
+ rules_filename => "$prefix/rules",
+ local_tests_only => 1,
+ dont_copy_prefs => 1,
+});
$sa->init(0); # parse rules
# load tests and write mail
@@ -207,7 +212,6 @@ cmd.exe !cmd\.exe
commander !commander
aaacomaaa !aaacomaaa
-aaa.com.aaa !aaa\.com\.aaa
com.foo.web !com\.foo\.web
# IPs for www.yahoo.com