svn commit: r786828 - /spamassassin/trunk/t/recreate.t

[jm...@apache.org]

Author: jm
Date: Sat Jun 20 14:01:14 2009
New Revision: 786828

URL: http://svn.apache.org/viewvc?rev=786828&view=rev
Log:
try to fix recreate.t to not be so odd. (a) it needs to use localrules.tmp so that it gets the equivalent of /etc/mail/spamassassin, .pre files, etc.  (b) it should not delete .pm files since this just creates problems

Modified:
    spamassassin/trunk/t/recreate.t

Modified: spamassassin/trunk/t/recreate.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/recreate.t?rev=786828&r1=786827&r2=786828&view=diff
==============================================================================
--- spamassassin/trunk/t/recreate.t (original)
+++ spamassassin/trunk/t/recreate.t Sat Jun 20 14:01:14 2009
@@ -42,17 +42,13 @@
 
 my $spamtest = Mail::SpamAssassin->new({
     rules_filename => "$prefix/t/log/test_rules_copy",
-    site_rules_filename => "$prefix/t/log/test_default.cf",
+    site_rules_filename => "$prefix/t/log/localrules.tmp",
     userprefs_filename  => "$prefix/masses/spamassassin/user_prefs",
     local_tests_only    => 1,
     debug             => 0,
     dont_copy_prefs   => 1,
 });
 
-# remove all plugin .pm files.  This should be ok as long as they are
-# being loaded with 'tryplugin' instead of 'loadplugin'
-unlink(<$prefix/t/log/test_rules_copy/*.pm>);
-
 $spamtest->init(0); # parse rules
 ok($spamtest);
 open (IN, "<data/spam/009");
@@ -71,7 +67,7 @@
 
 $spamtest = Mail::SpamAssassin->new({
     rules_filename => "$prefix/t/log/test_rules_copy",
-    site_rules_filename => "$prefix/t/log/test_default.cf",
+    site_rules_filename => "$prefix/t/log/localrules.tmp",
     userprefs_filename  => "$prefix/masses/spamassassin/user_prefs",
     local_tests_only    => 1,
     debug             => 0,