You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2023/05/04 16:42:35 UTC
svn commit: r1909610 - in /spamassassin/trunk: ./ t/ t/data/
Author: gbechis
Date: Thu May 4 16:42:35 2023
New Revision: 1909610
URL: http://svn.apache.org/viewvc?rev=1909610&view=rev
Log:
TxRep regression tests
bz #7173
Modified:
spamassassin/trunk/MANIFEST
spamassassin/trunk/t/basic_lint.t
spamassassin/trunk/t/basic_lint_net.t
spamassassin/trunk/t/basic_lint_without_sandbox.t
spamassassin/trunk/t/data/01_test_rules.pre
spamassassin/trunk/t/db_awl_path.t
spamassassin/trunk/t/db_awl_path_welcome_block.t
spamassassin/trunk/t/db_awl_perms.t
spamassassin/trunk/t/db_awl_perms_welcome_block.t
spamassassin/trunk/t/lang_lint.t
spamassassin/trunk/t/lint_nocreate_prefs.t
spamassassin/trunk/t/sa_awl.t
spamassassin/trunk/t/sa_awl_welcome_block.t
spamassassin/trunk/t/spamd_welcomelist_leak.t
spamassassin/trunk/t/spamd_whitelist_leak.t
spamassassin/trunk/t/sql_based_welcomelist.t
spamassassin/trunk/t/sql_based_whitelist.t
spamassassin/trunk/t/trust_path.t
spamassassin/trunk/t/welcomelist_addrs.t
spamassassin/trunk/t/welcomelist_from.t
spamassassin/trunk/t/whitelist_addrs.t
spamassassin/trunk/t/whitelist_from.t
spamassassin/trunk/t/wlbl_uri.t
Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/trunk/MANIFEST?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Thu May 4 16:42:35 2023
@@ -465,6 +465,16 @@ t/data/spamc_blank.cf
t/data/taintcheckplugin.pm
t/data/testplugin.pm
t/data/testplugin2.pm
+t/data/txrep/0
+t/data/txrep/1
+t/data/txrep/2
+t/data/txrep/3
+t/data/txrep/4
+t/data/txrep/5
+t/data/txrep/6
+t/data/txrep/7
+t/data/txrep/8
+t/data/txrep/9
t/data/validuserplugin.pm
t/data/welcomelists/action.eff.org
t/data/welcomelists/amazon_co_uk_ship
@@ -586,6 +596,9 @@ t/sa_awl.t
t/sa_awl_welcome_block.t
t/sa_check_spamd.t
t/sa_compile.t
+t/sa_txrep.t
+t/sa_txrep_sql.t
+t/sa_txrep_welcomelist_out.t
t/sha1.t
t/shortcircuit.t
t/shortcircuit_before_dns.t
Modified: spamassassin/trunk/t/basic_lint.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/basic_lint.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/basic_lint.t (original)
+++ spamassassin/trunk/t/basic_lint.t Thu May 4 16:42:35 2023
@@ -5,6 +5,10 @@ use SATest; sa_t_init("basic_lint");
use Test::More;
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
@test_locales = qw(C);
if (!$RUNNING_ON_WINDOWS) {
Modified: spamassassin/trunk/t/basic_lint_net.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/basic_lint_net.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/basic_lint_net.t (original)
+++ spamassassin/trunk/t/basic_lint_net.t Thu May 4 16:42:35 2023
@@ -10,6 +10,10 @@ plan tests => 2;
# ---------------------------------------------------------------------------
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
%patterns = (
qr/^/, 'anything',
);
Modified: spamassassin/trunk/t/basic_lint_without_sandbox.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/basic_lint_without_sandbox.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/basic_lint_without_sandbox.t (original)
+++ spamassassin/trunk/t/basic_lint_without_sandbox.t Thu May 4 16:42:35 2023
@@ -12,6 +12,10 @@ use Test::More tests => 3;
qr/^/, 'anything',
);
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
# override locale for this test!
$ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C';
Modified: spamassassin/trunk/t/data/01_test_rules.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/01_test_rules.pre?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/data/01_test_rules.pre (original)
+++ spamassassin/trunk/t/data/01_test_rules.pre Thu May 4 16:42:35 2023
@@ -4,7 +4,6 @@ dns_query_restriction deny *
dns_query_restriction allow spamassassin.org
# Load selection of non-default plugins for all tests
-loadplugin Mail::SpamAssassin::Plugin::AWL
loadplugin Mail::SpamAssassin::Plugin::RelayCountry
loadplugin Mail::SpamAssassin::Plugin::DCC
loadplugin Mail::SpamAssassin::Plugin::TextCat
Modified: spamassassin/trunk/t/db_awl_path.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/db_awl_path.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/db_awl_path.t (original)
+++ spamassassin/trunk/t/db_awl_path.t Thu May 4 16:42:35 2023
@@ -7,6 +7,7 @@ plan tests => 4;
use IO::File;
# ---------------------------------------------------------------------------
+#
diag "Note: This test when successful displays lockfile warning messages";
%is_spam_patterns = (
@@ -21,6 +22,10 @@ open (OUT, ">$workdir/awl");
print OUT "file created to block AWL from working; AWL expects a dir";
close OUT;
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
tstprefs ("
auto_whitelist_path ./$workdir/awl/this_lock_warning_is_ok
auto_whitelist_file_mode 0755
Modified: spamassassin/trunk/t/db_awl_path_welcome_block.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/db_awl_path_welcome_block.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/db_awl_path_welcome_block.t (original)
+++ spamassassin/trunk/t/db_awl_path_welcome_block.t Thu May 4 16:42:35 2023
@@ -20,6 +20,10 @@ open (OUT, ">$workdir/awl");
print OUT "file created to block AWL from working; AWL expects a dir";
close OUT;
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
tstprefs ("
auto_welcomelist_path ./$workdir/awl/this_lock_warning_is_ok
auto_welcomelist_file_mode 0755
Modified: spamassassin/trunk/t/db_awl_perms.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/db_awl_perms.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/db_awl_perms.t (original)
+++ spamassassin/trunk/t/db_awl_perms.t Thu May 4 16:42:35 2023
@@ -8,6 +8,10 @@ plan skip_all => "Tests don't work on wi
plan tests => 5;
# ---------------------------------------------------------------------------
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
# bug 6173
tstprefs ("
Modified: spamassassin/trunk/t/db_awl_perms_welcome_block.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/db_awl_perms_welcome_block.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/db_awl_perms_welcome_block.t (original)
+++ spamassassin/trunk/t/db_awl_perms_welcome_block.t Thu May 4 16:42:35 2023
@@ -8,6 +8,10 @@ plan skip_all => "Tests don't work on wi
plan tests => 5;
# ---------------------------------------------------------------------------
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
# bug 6173
tstprefs ("
Modified: spamassassin/trunk/t/lang_lint.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/lang_lint.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/lang_lint.t (original)
+++ spamassassin/trunk/t/lang_lint.t Thu May 4 16:42:35 2023
@@ -8,6 +8,9 @@ plan skip_all => "Long running tests dis
plan tests => 8;
# ---------------------------------------------------------------------------
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
my @locales = qw( de es fr it nl pl pl pt_BR );
%patterns = ( qr/^/, 'anything', );
Modified: spamassassin/trunk/t/lint_nocreate_prefs.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/lint_nocreate_prefs.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/lint_nocreate_prefs.t (original)
+++ spamassassin/trunk/t/lint_nocreate_prefs.t Thu May 4 16:42:35 2023
@@ -5,6 +5,9 @@ use SATest; sa_t_init("lint_nocreate_pre
use Test::More tests => 2;
# ---------------------------------------------------------------------------
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
%patterns = ( qr/^/, 'anything' );
Modified: spamassassin/trunk/t/sa_awl.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sa_awl.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/sa_awl.t (original)
+++ spamassassin/trunk/t/sa_awl.t Thu May 4 16:42:35 2023
@@ -11,6 +11,10 @@ use Test::More tests => 1;
q{ X-Spam-Status: Yes}, 'isspam',
);
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
tstprefs ("
auto_whitelist_path ./$userstate/awltest
auto_whitelist_file_mode 0755
Modified: spamassassin/trunk/t/sa_awl_welcome_block.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sa_awl_welcome_block.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/sa_awl_welcome_block.t (original)
+++ spamassassin/trunk/t/sa_awl_welcome_block.t Thu May 4 16:42:35 2023
@@ -11,6 +11,10 @@ use Test::More tests => 1;
q{ X-Spam-Status: Yes}, 'isspam',
);
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
tstprefs ("
auto_welcomelist_path ./$userstate/awltest
auto_welcomelist_file_mode 0755
Modified: spamassassin/trunk/t/spamd_welcomelist_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_welcomelist_leak.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_welcomelist_leak.t (original)
+++ spamassassin/trunk/t/spamd_welcomelist_leak.t Thu May 4 16:42:35 2023
@@ -9,6 +9,10 @@ plan skip_all => 'Spamd tests disabled.'
plan tests => 8;
# ---------------------------------------------------------------------------
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
# bug 6003
tstlocalrules (q{
Modified: spamassassin/trunk/t/spamd_whitelist_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_whitelist_leak.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_whitelist_leak.t (original)
+++ spamassassin/trunk/t/spamd_whitelist_leak.t Thu May 4 16:42:35 2023
@@ -9,6 +9,10 @@ plan skip_all => 'Spamd tests disabled.'
plan tests => 8;
# ---------------------------------------------------------------------------
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
# bug 6003
disable_compat "welcomelist_blocklist";
Modified: spamassassin/trunk/t/sql_based_welcomelist.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sql_based_welcomelist.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/sql_based_welcomelist.t (original)
+++ spamassassin/trunk/t/sql_based_welcomelist.t Thu May 4 16:42:35 2023
@@ -21,6 +21,10 @@ diag "Note: If there is a failure it may
sa_t_init("sql_based_welcomelist");
+tstpre("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
# only use rules defined here in tstprefs()
clear_localrules();
Modified: spamassassin/trunk/t/sql_based_whitelist.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sql_based_whitelist.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/sql_based_whitelist.t (original)
+++ spamassassin/trunk/t/sql_based_whitelist.t Thu May 4 16:42:35 2023
@@ -21,6 +21,10 @@ diag "Note: If there is a failure it may
sa_t_init("sql_based_whitelist");
+tstpre("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
# only use rules defined here in tstprefs()
clear_localrules();
Modified: spamassassin/trunk/t/trust_path.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/trust_path.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/trust_path.t (original)
+++ spamassassin/trunk/t/trust_path.t Thu May 4 16:42:35 2023
@@ -25,6 +25,10 @@ open(OLDERR, ">&STDERR") || die "Cannot
# quiet "used only once" warnings
1 if *OLDERR;
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
tstlocalrules ("
clear_originating_ip_headers
originating_ip_headers X-Yahoo-Post-IP X-Originating-IP X-Apparently-From
Modified: spamassassin/trunk/t/welcomelist_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/welcomelist_addrs.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/welcomelist_addrs.t (original)
+++ spamassassin/trunk/t/welcomelist_addrs.t Thu May 4 16:42:35 2023
@@ -12,6 +12,9 @@ plan skip_all => 'Need DB_File for this
plan tests => 35;
# ---------------------------------------------------------------------------
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
tstprefs ("
header AWL eval:check_from_in_auto_welcomelist()
Modified: spamassassin/trunk/t/welcomelist_from.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/welcomelist_from.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/welcomelist_from.t (original)
+++ spamassassin/trunk/t/welcomelist_from.t Thu May 4 16:42:35 2023
@@ -8,6 +8,9 @@ plan skip_all => 'Long running tests dis
plan tests => 32;
# ---------------------------------------------------------------------------
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
tstprefs ("
header USER_IN_WELCOMELIST eval:check_from_in_welcomelist()
Modified: spamassassin/trunk/t/whitelist_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_addrs.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_addrs.t (original)
+++ spamassassin/trunk/t/whitelist_addrs.t Thu May 4 16:42:35 2023
@@ -12,6 +12,9 @@ plan skip_all => 'Need DB_File for this
plan tests => 35;
# ---------------------------------------------------------------------------
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
tstprefs ("
header AWL eval:check_from_in_auto_welcomelist()
Modified: spamassassin/trunk/t/whitelist_from.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_from.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_from.t (original)
+++ spamassassin/trunk/t/whitelist_from.t Thu May 4 16:42:35 2023
@@ -11,6 +11,10 @@ plan tests => 32;
disable_compat "welcomelist_blocklist";
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
tstprefs ("
header USER_IN_WELCOMELIST eval:check_from_in_welcomelist()
tflags USER_IN_WELCOMELIST userconf nice noautolearn
Modified: spamassassin/trunk/t/wlbl_uri.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/wlbl_uri.t?rev=1909610&r1=1909609&r2=1909610&view=diff
==============================================================================
--- spamassassin/trunk/t/wlbl_uri.t (original)
+++ spamassassin/trunk/t/wlbl_uri.t Thu May 4 16:42:35 2023
@@ -4,6 +4,10 @@ use lib '.'; use lib 't';
use SATest; sa_t_init("wlbl_uri");
use Test::More tests => 12;
+tstpre ("
+ loadplugin Mail::SpamAssassin::Plugin::AWL
+");
+
# copied from 60_welcome.cf
# should do the right thing with the different disable/enable compat settings
my $myrules = <<'END';