svn commit: r1889395 - in /spamassassin/trunk: spamassassin.raw t/basic_lint_net.t

[he...@apache.org]

Author: hege
Date: Sun May  2 10:14:08 2021
New Revision: 1889395

URL: http://svn.apache.org/viewvc?rev=1889395&view=rev
Log:
Allow --lint --net to test network

Modified:
    spamassassin/trunk/spamassassin.raw
    spamassassin/trunk/t/basic_lint_net.t

Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamassassin.raw?rev=1889395&r1=1889394&r2=1889395&view=diff
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Sun May  2 10:14:08 2021
@@ -190,6 +190,7 @@ GetOptions(
   '6'                                       => sub { $opt{'force_ipv6'} = 1;
                                                      $opt{'force_ipv4'} = 0; },
   'lint'                                    => \$opt{'lint'},
+  'net'                                     => \$opt{'net'},
   'local-only|local|L'                      => \$opt{'local'},
   'mbox'                                    => sub { $opt{'format'} = 'mbox'; },
   'mbx'                                     => sub { $opt{'format'} = 'mbx'; },
@@ -249,7 +250,8 @@ if (Mail::SpamAssassin::Util::am_running
 }
 
 # bug 5048: --lint should not cause network accesses
-if ($opt{'lint'}) { $opt{'local'} = 1; }
+# allow --net to override for testing
+if ($opt{'lint'} && !$opt{'net'}) { $opt{'local'} = 1; }
 
 # create the tester factory
 my $spamtest = Mail::SpamAssassin->new(

Modified: spamassassin/trunk/t/basic_lint_net.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/basic_lint_net.t?rev=1889395&r1=1889394&r2=1889395&view=diff
==============================================================================
--- spamassassin/trunk/t/basic_lint_net.t (original)
+++ spamassassin/trunk/t/basic_lint_net.t Sun May  2 10:14:08 2021
@@ -13,10 +13,13 @@ plan tests => 1;
 %patterns = (
   q{  }, 'anything',
 );
+%anti_patterns = (
+  q{ warn: }, 'warning',
+);
 
 # override locale for this test!
 $ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C';
 
-sarun ("--lint", \&patterns_run_cb);
+sarun ("--lint --net", \&patterns_run_cb);
 ok_all_patterns();