svn commit: r162115 - in /spamassassin/trunk: spamassassin.raw t/debug.t

[pa...@apache.org]

Author: parker
Date: Wed Apr 20 20:28:26 2005
New Revision: 162115

URL: http://svn.apache.org/viewcvs?rev=162115&view=rev
Log:
Fix up test failures and extra debug output from logging code

Modified:
    spamassassin/trunk/spamassassin.raw
    spamassassin/trunk/t/debug.t

Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamassassin.raw?rev=162115&r1=162114&r2=162115&view=diff
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Wed Apr 20 20:28:26 2005
@@ -81,7 +81,7 @@
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::ArchiveIterator;
 use Mail::SpamAssassin::Util::Progress;
-use Mail::SpamAssassin::Logger;
+use Mail::SpamAssassin::Logger qw(log_message);
 
 my %resphash = (
   EX_OK          => 0,     # no problems

Modified: spamassassin/trunk/t/debug.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/debug.t?rev=162115&r1=162114&r2=162115&view=diff
==============================================================================
--- spamassassin/trunk/t/debug.t (original)
+++ spamassassin/trunk/t/debug.t Wed Apr 20 20:28:26 2005
@@ -20,7 +20,7 @@
 use Test;
 use Mail::SpamAssassin;
 
-plan tests => 2;
+plan tests => 3;
 
 # list of known debug facilities
 my %facility = map {; $_ => 1 }
@@ -31,20 +31,11 @@
       uridnsbl util ),
 ;
 
-# initialize SpamAssassin
-my $sa = Mail::SpamAssassin->new({
-    rules_filename => "$prefix/t/log/test_rules_copy",
-    site_rules_filename => "$prefix/t/log/test_default.cf",
-    userprefs_filename  => "$prefix/masses/spamassassin/user_prefs",
-    local_tests_only    => 1,
-    debug             => 1,
-    dont_copy_prefs   => 1,
-});
-$sa->init(0); # parse rules
-
 my $fh = IO::File->new_tmpfile();
 open(STDERR, ">&=".fileno($fh)) || die "Cannot reopen STDERR";
-sarun("-t -D < data/spam/dnsbl.eml");
+
+ok(sarun("-t -D < data/spam/dnsbl.eml"));
+
 seek($fh, 0, 0);
 my $error = do {
     local $/;