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 2019/08/09 15:43:03 UTC
svn commit: r1864819 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Plugin/ branches/3.4/t/
branches/3.4/t/data/ trunk/lib/Mail/SpamAssassin/Plugin/ trunk/t/
trunk/t/data/
Author: hege
Date: Fri Aug 9 15:43:02 2019
New Revision: 1864819
URL: http://svn.apache.org/viewvc?rev=1864819&view=rev
Log:
Fix some tests, test more non-default modules too
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
spamassassin/branches/3.4/t/data/01_test_rules.pre
spamassassin/branches/3.4/t/debug.t
spamassassin/branches/3.4/t/plugin_file.t
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
spamassassin/trunk/t/data/01_test_rules.pre
spamassassin/trunk/t/debug.t
spamassassin/trunk/t/plugin_file.t
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm?rev=1864819&r1=1864818&r2=1864819&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm Fri Aug 9 15:43:02 2019
@@ -148,6 +148,7 @@ sub set_config {
push (@cmds, {
setting => 'uri_block_cc',
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
@@ -189,6 +190,7 @@ sub set_config {
push (@cmds, {
setting => 'uri_block_cont',
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
@@ -230,6 +232,7 @@ sub set_config {
push (@cmds, {
setting => 'uri_block_isp',
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
@@ -269,6 +272,7 @@ sub set_config {
push (@cmds, {
setting => 'uri_block_cidr',
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
@@ -314,6 +318,7 @@ sub set_config {
push (@cmds, {
setting => 'uri_block_exclude',
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
Modified: spamassassin/branches/3.4/t/data/01_test_rules.pre
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/data/01_test_rules.pre?rev=1864819&r1=1864818&r2=1864819&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/data/01_test_rules.pre (original)
+++ spamassassin/branches/3.4/t/data/01_test_rules.pre Fri Aug 9 15:43:02 2019
@@ -20,3 +20,22 @@ loadplugin Mail::SpamAssassin::Plugin::U
loadplugin Mail::SpamAssassin::Plugin::WLBLEval
loadplugin Mail::SpamAssassin::Plugin::VBounce
+# Try to load some non-default plugins also
+loadplugin Mail::SpamAssassin::Plugin::RelayCountry
+loadplugin Mail::SpamAssassin::Plugin::DCC
+loadplugin Mail::SpamAssassin::Plugin::AntiVirus
+loadplugin Mail::SpamAssassin::Plugin::AWL
+#loadplugin Mail::SpamAssassin::Plugin::TextCat
+#loadplugin Mail::SpamAssassin::Plugin::AccessDB
+loadplugin Mail::SpamAssassin::Plugin::Shortcircuit
+#loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody
+loadplugin Mail::SpamAssassin::Plugin::ASN
+#loadplugin Mail::SpamAssassin::Plugin::PhishTag
+#loadplugin Mail::SpamAssassin::Plugin::TxRep
+loadplugin Mail::SpamAssassin::Plugin::URILocalBL
+loadplugin Mail::SpamAssassin::Plugin::PDFInfo
+loadplugin Mail::SpamAssassin::Plugin::HashBL
+#loadplugin Mail::SpamAssassin::Plugin::ResourceLimits
+loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof
+loadplugin Mail::SpamAssassin::Plugin::Phishing
+loadplugin Mail::SpamAssassin::Plugin::OLEMacro
Modified: spamassassin/branches/3.4/t/debug.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/debug.t?rev=1864819&r1=1864818&r2=1864819&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/debug.t (original)
+++ spamassassin/branches/3.4/t/debug.t Fri Aug 9 15:43:02 2019
@@ -32,7 +32,7 @@ my %facility = map( ($_, 1),
hashcash ident ignore info ldap learn locker log logger markup
message metadata mimeheader netset plugin prefork progress pyzor razor2
received-header replacetags reporter rules rules-all spamd spf textcat
- timing TxRep uri uridnsbl util ));
+ timing TxRep uri uridnsbl util pdfinfo asn ));
my $fh = IO::File->new_tmpfile();
open(STDERR, ">&=".fileno($fh)) || die "Cannot reopen STDERR";
Modified: spamassassin/branches/3.4/t/plugin_file.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/plugin_file.t?rev=1864819&r1=1864818&r2=1864819&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/plugin_file.t (original)
+++ spamassassin/branches/3.4/t/plugin_file.t Fri Aug 9 15:43:02 2019
@@ -14,7 +14,7 @@ q{ registered myTestPlugin }, 'registere
q{ myTestPlugin eval test called }, 'test_called',
q{ myTestPlugin finishing }, 'plugin_finished',
-q{ test: plugins loaded: Mail::SpamAssassin::Plugin::AWL=HASH }, 'plugins_loaded',
+q{ test: plugins loaded: Mail::SpamAssassin::Plugin::ASN=HASH }, 'plugins_loaded',
q{ myTestPlugin=HASH }, 'plugins_loaded2',
);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm?rev=1864819&r1=1864818&r2=1864819&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm Fri Aug 9 15:43:02 2019
@@ -153,6 +153,7 @@ sub set_config {
push (@cmds, {
setting => 'uri_block_cc',
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
@@ -194,6 +195,7 @@ sub set_config {
push (@cmds, {
setting => 'uri_block_cont',
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
@@ -235,6 +237,7 @@ sub set_config {
push (@cmds, {
setting => 'uri_block_isp',
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
@@ -268,6 +271,7 @@ sub set_config {
push (@cmds, {
setting => 'uri_block_cidr',
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
@@ -294,6 +298,7 @@ sub set_config {
push (@cmds, {
setting => 'uri_block_exclude',
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
Modified: spamassassin/trunk/t/data/01_test_rules.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/01_test_rules.pre?rev=1864819&r1=1864818&r2=1864819&view=diff
==============================================================================
--- spamassassin/trunk/t/data/01_test_rules.pre (original)
+++ spamassassin/trunk/t/data/01_test_rules.pre Fri Aug 9 15:43:02 2019
@@ -19,3 +19,22 @@ loadplugin Mail::SpamAssassin::Plugin::U
loadplugin Mail::SpamAssassin::Plugin::WLBLEval
loadplugin Mail::SpamAssassin::Plugin::VBounce
+# Try to load some non-default plugins also
+loadplugin Mail::SpamAssassin::Plugin::RelayCountry
+loadplugin Mail::SpamAssassin::Plugin::DCC
+loadplugin Mail::SpamAssassin::Plugin::AntiVirus
+loadplugin Mail::SpamAssassin::Plugin::AWL
+#loadplugin Mail::SpamAssassin::Plugin::TextCat
+#loadplugin Mail::SpamAssassin::Plugin::AccessDB
+loadplugin Mail::SpamAssassin::Plugin::Shortcircuit
+#loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody
+loadplugin Mail::SpamAssassin::Plugin::ASN
+#loadplugin Mail::SpamAssassin::Plugin::PhishTag
+#loadplugin Mail::SpamAssassin::Plugin::TxRep
+loadplugin Mail::SpamAssassin::Plugin::URILocalBL
+loadplugin Mail::SpamAssassin::Plugin::PDFInfo
+loadplugin Mail::SpamAssassin::Plugin::HashBL
+#loadplugin Mail::SpamAssassin::Plugin::ResourceLimits
+loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof
+loadplugin Mail::SpamAssassin::Plugin::Phishing
+loadplugin Mail::SpamAssassin::Plugin::OLEMacro
Modified: spamassassin/trunk/t/debug.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/debug.t?rev=1864819&r1=1864818&r2=1864819&view=diff
==============================================================================
--- spamassassin/trunk/t/debug.t (original)
+++ spamassassin/trunk/t/debug.t Fri Aug 9 15:43:02 2019
@@ -32,7 +32,7 @@ my %facility = map( ($_, 1),
ident ignore info ldap learn locker log logger markup
message metadata mimeheader netset plugin prefork progress pyzor razor2
received-header replacetags reporter rules rules-all spamd spf textcat
- timing TxRep uri uridnsbl util ));
+ timing TxRep uri uridnsbl util pdfinfo asn ));
my $fh = IO::File->new_tmpfile();
open(STDERR, ">&=".fileno($fh)) || die "Cannot reopen STDERR";
Modified: spamassassin/trunk/t/plugin_file.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/plugin_file.t?rev=1864819&r1=1864818&r2=1864819&view=diff
==============================================================================
--- spamassassin/trunk/t/plugin_file.t (original)
+++ spamassassin/trunk/t/plugin_file.t Fri Aug 9 15:43:02 2019
@@ -14,7 +14,7 @@ q{ registered myTestPlugin }, 'registere
q{ myTestPlugin eval test called }, 'test_called',
q{ myTestPlugin finishing }, 'plugin_finished',
-q{ test: plugins loaded: Mail::SpamAssassin::Plugin::AWL=HASH }, 'plugins_loaded',
+q{ test: plugins loaded: Mail::SpamAssassin::Plugin::ASN=HASH }, 'plugins_loaded',
q{ myTestPlugin=HASH }, 'plugins_loaded2',
);