[SACVS] CVS: spamassassin/t db_awl_path.t,1.5,1.6 db_based_whitelist.t,1.8,1.9 db_based_whitelist_ips.t,1.4,1.5 whitelist_addrs.t,1.2,1.3

Update of /cvsroot/spamassassin/spamassassin/t
In directory sc8-pr-cvs1:/tmp/cvs-serv2276/t

Modified Files:
        db_awl_path.t db_based_whitelist.t db_based_whitelist_ips.t 
        whitelist_addrs.t 
Log Message:
bug 2459: more work on reorganizing auto-whitelist implementation


Index: db_awl_path.t
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/t/db_awl_path.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -w -u -d -r1.5 -r1.6
--- db_awl_path.t       14 Mar 2003 19:39:19 -0000      1.5
+++ db_awl_path.t       25 Sep 2003 03:11:24 -0000      1.6
@@ -22,7 +22,7 @@
 tstprefs ("
         $default_cf_lines
         auto_whitelist_path ./log/awl/shouldbeinaccessible
-        auto_whitelist_mode 0755
+        auto_whitelist_file_mode 0755
 ");
 
 my $fh = IO::File->new_tmpfile();

Index: db_based_whitelist.t
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/t/db_based_whitelist.t,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -w -u -d -r1.8 -r1.9
--- db_based_whitelist.t        2 Oct 2002 13:20:33 -0000       1.8
+++ db_based_whitelist.t        25 Sep 2003 03:11:24 -0000      1.9
@@ -14,19 +14,18 @@
 );
 
 %patterns = %is_nonspam_patterns;
-$scr_test_args = "-M Mail::SpamAssassin::DBBasedAddrList";
 
 ok (sarun ("--remove-addr-from-whitelist 
whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb));
 
 # 3 times, to get into the whitelist:
-ok (sarun ("-L -a -t < data/nice/002", \&patterns_run_cb));
-ok (sarun ("-L -a -t < data/nice/002", \&patterns_run_cb));
-ok (sarun ("-L -a -t < data/nice/002", \&patterns_run_cb));
+ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb));
+ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb));
+ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb));
 
 # Now check
-ok (sarun ("-L -a -t < data/nice/002", \&patterns_run_cb));
+ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb));
 ok_all_patterns();
 
 %patterns = %is_spam_patterns;
-ok (sarun ("-L -a -t < data/spam/004", \&patterns_run_cb));
+ok (sarun ("-L -t < data/spam/004", \&patterns_run_cb));
 ok_all_patterns();

Index: db_based_whitelist_ips.t
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/t/db_based_whitelist_ips.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -w -u -d -r1.4 -r1.5
--- db_based_whitelist_ips.t    9 Oct 2002 14:42:15 -0000       1.4
+++ db_based_whitelist_ips.t    25 Sep 2003 03:11:24 -0000      1.5
@@ -18,15 +18,15 @@
 ok (sarun ("--remove-addr-from-whitelist 
whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb));
 
 # 3 times, to get into the whitelist:
-ok (sarun ("-L -a -t < data/nice/002", \&patterns_run_cb));
-ok (sarun ("-L -a -t < data/nice/002", \&patterns_run_cb));
-ok (sarun ("-L -a -t < data/nice/002", \&patterns_run_cb));
+ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb));
+ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb));
+ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb));
 
 # Now check
-ok (sarun ("-L -a -t < data/nice/002", \&patterns_run_cb));
+ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb));
 ok_all_patterns();
 
 %patterns = %is_spam_patterns;
-ok (sarun ("-L -a -t < data/spam/007", \&patterns_run_cb));
+ok (sarun ("-L -t < data/spam/007", \&patterns_run_cb));
 ok_all_patterns();
 

Index: whitelist_addrs.t
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/t/whitelist_addrs.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -w -u -d -r1.2 -r1.3
--- whitelist_addrs.t   26 Sep 2002 19:45:41 -0000      1.2
+++ whitelist_addrs.t   25 Sep 2003 03:11:24 -0000      1.3
@@ -18,22 +18,22 @@
 %patterns = %no_patterns;
 sarun ("--add-addr-to-whitelist 
whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb);
 %patterns = %is_nonspam_patterns;
-ok (sarun ("-L -a -t < data/nice/002", \&patterns_run_cb));
+ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb));
 ok_all_patterns();
 %patterns = %is_nonspam_patterns;
-sarun ("-L -a -t < data/spam/004", \&patterns_run_cb);
+sarun ("-L -t < data/spam/004", \&patterns_run_cb);
 ok_all_patterns();
 
 %patterns = %no_patterns;
 sarun ("--remove-addr-from-whitelist 
whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb);
 %patterns = %is_spam_patterns;
-sarun ("-L -a -t < data/spam/004", \&patterns_run_cb);
+sarun ("-L -t < data/spam/004", \&patterns_run_cb);
 ok_all_patterns();
 
 %patterns = %no_patterns;
 sarun ("--add-addr-to-blacklist 
whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb);
 %patterns = %is_spam_patterns;
-sarun ("-L -a -t < data/nice/002", \&patterns_run_cb);
+sarun ("-L -t < data/nice/002", \&patterns_run_cb);
 ok_all_patterns();
 
 



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf