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/01 06:56:11 UTC

svn commit: r1900437 - in /spamassassin/trunk/t: all_modules.t data/01_test_rules.pre

Author: hege
Date: Sun May  1 06:56:11 2022
New Revision: 1900437

URL: http://svn.apache.org/viewvc?rev=1900437&view=rev
Log:
Bug 7983 - t/all_modules.t (OLEVBMacro) fails without Archive::Zip/IO::String

Modified:
    spamassassin/trunk/t/all_modules.t
    spamassassin/trunk/t/data/01_test_rules.pre

Modified: spamassassin/trunk/t/all_modules.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/all_modules.t?rev=1900437&r1=1900436&r2=1900437&view=diff
==============================================================================
--- spamassassin/trunk/t/all_modules.t (original)
+++ spamassassin/trunk/t/all_modules.t Sun May  1 06:56:11 2022
@@ -81,16 +81,16 @@ tstprefs("
         q{ Syntax error }, 'syntax',
         q{ Use of uninitialized }, 'uninitialized',
         q{ warn: }, 'warn',
-        q{ SpamAssassin failed to parse line }, 'parse',
+        q{ failed to parse }, 'parse',
         '/ at .* line \d+/', 'at_line',
             );
 
 if (conf_bool('run_net_tests')) {
     # sometimes trips on URIBL_BLOCKED, ignore..
-    # also ignore BSD::Resource, Mail::DMARC not installed
-    sarun ("-D -t < data/nice/001 2>&1 | grep -vE '(dns_block_rule|ResourceLimits not used)'", \&patterns_run_cb);
+    # also ignore ResourceLimits/OLEVBMacro missing required modules
+    sarun ("-D -t < data/nice/001 2>&1 | grep -vE '(dns_block_rule|ResourceLimits not used|OLEVBMacro:.*required module)'", \&patterns_run_cb);
     ok_all_patterns();
 } else {
-    sarun ("-D -L -t < data/nice/001 2>&1 | grep -vE '(ResourceLimits not used)'", \&patterns_run_cb);
+    sarun ("-D -L -t < data/nice/001 2>&1 | grep -vE '(ResourceLimits not used|OLEVBMacro:.*required module)'", \&patterns_run_cb);
     ok_all_patterns();
 }

Modified: spamassassin/trunk/t/data/01_test_rules.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/01_test_rules.pre?rev=1900437&r1=1900436&r2=1900437&view=diff
==============================================================================
--- spamassassin/trunk/t/data/01_test_rules.pre (original)
+++ spamassassin/trunk/t/data/01_test_rules.pre Sun May  1 06:56:11 2022
@@ -16,7 +16,6 @@ loadplugin Mail::SpamAssassin::Plugin::P
 loadplugin Mail::SpamAssassin::Plugin::HashBL
 loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof
 loadplugin Mail::SpamAssassin::Plugin::Phishing
-loadplugin Mail::SpamAssassin::Plugin::OLEVBMacro
 loadplugin Mail::SpamAssassin::Plugin::Esp
 loadplugin Mail::SpamAssassin::Plugin::ExtractText