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 18:09:35 UTC
svn commit: r1909613 - in /spamassassin/trunk/t: sa_txrep_sql.t sa_txrep_welcomelist_out.t
Author: gbechis
Date: Thu May 4 18:09:35 2023
New Revision: 1909613
URL: http://svn.apache.org/viewvc?rev=1909613&view=rev
Log:
enable more tests
Modified:
spamassassin/trunk/t/sa_txrep_sql.t
spamassassin/trunk/t/sa_txrep_welcomelist_out.t
Modified: spamassassin/trunk/t/sa_txrep_sql.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sa_txrep_sql.t?rev=1909613&r1=1909612&r2=1909613&view=diff
==============================================================================
--- spamassassin/trunk/t/sa_txrep_sql.t (original)
+++ spamassassin/trunk/t/sa_txrep_sql.t Thu May 4 18:09:35 2023
@@ -13,11 +13,13 @@ use constant SQLITE => (HAS_DBI && HAS_D
use constant SQL => conf_bool('run_awl_sql_tests');
plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');
-plan skip_all => "run_awl_sql_tests not enabled or DBI/SQLite not found" unless (SQLITE && SQL);
+plan skip_all => "run_awl_sql_tests not enabled or DBI/SQLite not found" unless (SQLITE || SQL);
diag "Note: If there is a failure it may be due to an incorrect SQL configuration." if (SQL);
-plan tests => 2;
+my $tests = 2;
+$tests += 2 if (SQL);
+plan tests => $tests;
# ---------------------------------------------------------------------------
@@ -63,6 +65,16 @@ if (SQLITE) {
q{ 0.1 TXREP } => 'Score normalizing',
);
+ %anti_patterns = %txrep_pattern0;
+ %patterns = ();
+ sarun ("-t < data/txrep/6", \&patterns_run_cb);
+ ok_all_patterns();
+ clear_pattern_counters();
+
+ %anti_patterns = ();
+ %patterns = %txrep_pattern0;
+ sarun ("-t < data/txrep/7", \&patterns_run_cb);
+ ok_all_patterns();
}
if(SQL) {
Modified: spamassassin/trunk/t/sa_txrep_welcomelist_out.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sa_txrep_welcomelist_out.t?rev=1909613&r1=1909612&r2=1909613&view=diff
==============================================================================
--- spamassassin/trunk/t/sa_txrep_welcomelist_out.t (original)
+++ spamassassin/trunk/t/sa_txrep_welcomelist_out.t Thu May 4 18:09:35 2023
@@ -13,11 +13,13 @@ use constant SQLITE => (HAS_DBI && HAS_D
use constant SQL => conf_bool('run_awl_sql_tests');
plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');
-plan skip_all => "run_awl_sql_tests not enabled or DBI/SQLite not found" unless (SQLITE && SQL);
+plan skip_all => "run_awl_sql_tests not enabled or DBI/SQLite not found" unless (SQLITE || SQL);
diag "Note: If there is a failure it may be due to an incorrect SQL configuration." if (SQL);
-plan tests => 8;
+my $tests = 8;
+$tests += 8 if (SQL);
+plan tests => $tests;
# ---------------------------------------------------------------------------
@@ -76,6 +78,93 @@ if (SQLITE) {
%txrep_pattern1 = (
q{ 0.1 TXREP } => 'Score normalizing',
);
+
+ %anti_patterns = %txrep_pattern0;
+ %patterns = ();
+ sarun ("-t < data/txrep/8", \&patterns_run_cb);
+ ok_all_patterns();
+ clear_pattern_counters();
+
+ %anti_patterns = ();
+ %patterns = %txrep_pattern0;
+ sarun ("-t < data/txrep/9", \&patterns_run_cb);
+ ok_all_patterns();
+ clear_pattern_counters();
+
+ tstprefs ("
+ use_txrep 1
+ txrep_factory Mail::SpamAssassin::SQLBasedAddrList
+ auto_welcomelist_distinguish_signed 1
+ txrep_welcomelist_out 0
+ clear_trusted_networks
+ clear_internal_networks
+ internal_networks 64.142.3.173
+ trusted_networks 64.142.3.173
+ user_awl_dsn dbi:SQLite:dbname=$workdir/txrep.db
+ ");
+
+ create_db($workdir);
+ %anti_patterns = %txrep_pattern1;
+ %patterns = ();
+ sarun ("-t < data/txrep/8", \&patterns_run_cb);
+ ok_all_patterns();
+ clear_pattern_counters();
+
+ %anti_patterns = ();
+ %patterns = %txrep_pattern1;
+ sarun ("-t < data/txrep/9", \&patterns_run_cb);
+ ok_all_patterns();
+ clear_pattern_counters();
+
+ tstprefs ("
+ use_txrep 1
+ txrep_factory Mail::SpamAssassin::SQLBasedAddrList
+ auto_welcomelist_distinguish_signed 0
+ txrep_welcomelist_out 0
+ clear_trusted_networks
+ clear_internal_networks
+ internal_networks 64.142.3.173
+ trusted_networks 64.142.3.173
+ user_awl_dsn dbi:SQLite:dbname=$workdir/txrep.db
+ ");
+
+ create_db($workdir);
+ %anti_patterns = %txrep_pattern1;
+ %patterns = ();
+ sarun ("-t < data/txrep/8", \&patterns_run_cb);
+ ok_all_patterns();
+ clear_pattern_counters();
+
+ %anti_patterns = ();
+ %patterns = %txrep_pattern1;
+ sarun ("-t < data/txrep/9", \&patterns_run_cb);
+ ok_all_patterns();
+ clear_pattern_counters();
+
+ tstprefs ("
+ use_txrep 1
+ txrep_factory Mail::SpamAssassin::SQLBasedAddrList
+ auto_welcomelist_distinguish_signed 0
+ txrep_welcomelist_out 1
+ clear_trusted_networks
+ clear_internal_networks
+ internal_networks 64.142.3.173
+ trusted_networks 64.142.3.173
+ user_awl_dsn dbi:SQLite:dbname=$workdir/txrep.db
+ ");
+
+ create_db($workdir);
+ %anti_patterns = %txrep_pattern0;
+ %patterns = ();
+ sarun ("-t < data/txrep/8", \&patterns_run_cb);
+ ok_all_patterns();
+ clear_pattern_counters();
+
+ %anti_patterns = ();
+ %patterns = %txrep_pattern0;
+ sarun ("-t < data/txrep/9", \&patterns_run_cb);
+ ok_all_patterns();
+ clear_pattern_counters();
}
if(SQL) {