You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/06/20 14:29:17 UTC
svn commit: r549085 - in /spamassassin/trunk/t: root_spamd_tell.t
root_spamd_tell_paranoid.t root_spamd_tell_x.t root_spamd_tell_x_paranoid.t
Author: jm
Date: Wed Jun 20 05:29:16 2007
New Revision: 549085
URL: http://svn.apache.org/viewvc?view=rev&rev=549085
Log:
bug 5518: fix root_* test scripts to use SDBM_File instead of DB_File, for ease of running on our Solaris zone
Modified:
spamassassin/trunk/t/root_spamd_tell.t
spamassassin/trunk/t/root_spamd_tell_paranoid.t
spamassassin/trunk/t/root_spamd_tell_x.t
spamassassin/trunk/t/root_spamd_tell_x_paranoid.t
Modified: spamassassin/trunk/t/root_spamd_tell.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/root_spamd_tell.t?view=diff&rev=549085&r1=549084&r2=549085
==============================================================================
--- spamassassin/trunk/t/root_spamd_tell.t (original)
+++ spamassassin/trunk/t/root_spamd_tell.t Wed Jun 20 05:29:16 2007
@@ -21,8 +21,8 @@
$spamc = "sudo -u nobody $spamc";
# remove these first
-unlink('log/user_state/bayes_seen');
-unlink('log/user_state/bayes_toks');
+unlink('log/user_state/bayes_seen.dir');
+unlink('log/user_state/bayes_toks.dir');
# ensure it is writable by all
use File::Path; mkpath("log/user_state"); chmod 01777, "log/user_state";
@@ -40,8 +40,8 @@
ok(stop_spamd());
# ensure these are not owned by root
-ok check_owner('log/user_state/bayes_seen');
-ok check_owner('log/user_state/bayes_toks');
+ok check_owner('log/user_state/bayes_seen.dir');
+ok check_owner('log/user_state/bayes_toks.dir');
sub check_owner {
my $f = shift;
Modified: spamassassin/trunk/t/root_spamd_tell_paranoid.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/root_spamd_tell_paranoid.t?view=diff&rev=549085&r1=549084&r2=549085
==============================================================================
--- spamassassin/trunk/t/root_spamd_tell_paranoid.t (original)
+++ spamassassin/trunk/t/root_spamd_tell_paranoid.t Wed Jun 20 05:29:16 2007
@@ -21,12 +21,17 @@
$spamc = "sudo -u nobody $spamc";
# remove these first
-unlink('log/user_state/bayes_seen');
-unlink('log/user_state/bayes_toks');
+unlink('log/user_state/bayes_seen.dir');
+unlink('log/user_state/bayes_toks.dir');
# ensure it is writable by all
use File::Path; mkpath("log/user_state"); chmod 01777, "log/user_state";
+# use SDBM so we do not need DB_File
+tstlocalrules ("
+ bayes_store_module Mail::SpamAssassin::BayesStore::SDBM
+");
+
ok(start_spamd("-L --allow-tell --paranoid"));
ok(spamcrun("-lx -L ham < data/spam/001", \&patterns_run_cb));
@@ -35,8 +40,8 @@
ok(stop_spamd());
# ensure these are not owned by root
-ok check_owner('log/user_state/bayes_seen');
-ok check_owner('log/user_state/bayes_toks');
+ok check_owner('log/user_state/bayes_seen.dir');
+ok check_owner('log/user_state/bayes_toks.dir');
sub check_owner {
my $f = shift;
Modified: spamassassin/trunk/t/root_spamd_tell_x.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/root_spamd_tell_x.t?view=diff&rev=549085&r1=549084&r2=549085
==============================================================================
--- spamassassin/trunk/t/root_spamd_tell_x.t (original)
+++ spamassassin/trunk/t/root_spamd_tell_x.t Wed Jun 20 05:29:16 2007
@@ -21,12 +21,17 @@
$spamc = "sudo -u nobody $spamc";
# remove these first
-unlink('log/user_state/bayes_seen');
-unlink('log/user_state/bayes_toks');
+unlink('log/user_state/bayes_seen.dir');
+unlink('log/user_state/bayes_toks.dir');
# ensure it is writable by all
use File::Path; mkpath("log/user_state"); chmod 01777, "log/user_state";
+# use SDBM so we do not need DB_File
+tstlocalrules ("
+ bayes_store_module Mail::SpamAssassin::BayesStore::SDBM
+");
+
ok(start_spamd("-L --allow-tell --create-prefs -x"));
ok(spamcrun("-lx -L ham < data/spam/001", \&patterns_run_cb));
@@ -35,8 +40,8 @@
ok(stop_spamd());
# ensure these are not owned by root
-ok check_owner('log/user_state/bayes_seen');
-ok check_owner('log/user_state/bayes_toks');
+ok check_owner('log/user_state/bayes_seen.dir');
+ok check_owner('log/user_state/bayes_toks.dir');
sub check_owner {
my $f = shift;
Modified: spamassassin/trunk/t/root_spamd_tell_x_paranoid.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/root_spamd_tell_x_paranoid.t?view=diff&rev=549085&r1=549084&r2=549085
==============================================================================
--- spamassassin/trunk/t/root_spamd_tell_x_paranoid.t (original)
+++ spamassassin/trunk/t/root_spamd_tell_x_paranoid.t Wed Jun 20 05:29:16 2007
@@ -21,12 +21,17 @@
$spamc = "sudo -u nobody $spamc";
# remove these first
-unlink('log/user_state/bayes_seen');
-unlink('log/user_state/bayes_toks');
+unlink('log/user_state/bayes_seen.dir');
+unlink('log/user_state/bayes_toks.dir');
# ensure it is writable by all
use File::Path; mkpath("log/user_state"); chmod 01777, "log/user_state";
+# use SDBM so we do not need DB_File
+tstlocalrules ("
+ bayes_store_module Mail::SpamAssassin::BayesStore::SDBM
+");
+
ok(start_spamd("-L --allow-tell --create-prefs -x --paranoid"));
ok(spamcrun("-lx -L ham < data/spam/001", \&patterns_run_cb));
@@ -35,8 +40,8 @@
ok(stop_spamd());
# ensure these are not owned by root
-ok check_owner('log/user_state/bayes_seen');
-ok check_owner('log/user_state/bayes_toks');
+ok check_owner('log/user_state/bayes_seen.dir');
+ok check_owner('log/user_state/bayes_toks.dir');
sub check_owner {
my $f = shift;