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

[jm...@apache.org]

Author: jm
Date: Thu Jun 29 08:14:30 2006
New Revision: 418068

URL: http://svn.apache.org/viewvc?rev=418068&view=rev
Log:
fix recreate.t failures; plugin issues should not affect this test

Modified:
    spamassassin/trunk/t/recreate.t

Modified: spamassassin/trunk/t/recreate.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/recreate.t?rev=418068&r1=418067&r2=418068&view=diff
==============================================================================
--- spamassassin/trunk/t/recreate.t (original)
+++ spamassassin/trunk/t/recreate.t Thu Jun 29 08:14:30 2006
@@ -28,7 +28,17 @@
 
 our $warning = 0;
 
-$SIG{'__WARN__'} = sub { print STDERR @_; ++$warning; };
+$SIG{'__WARN__'} = sub {
+  print STDERR @_;
+
+  # certain warnings can be ignored for this test
+  if ($_[0] =~ m{plugin: failed to parse plugin.*: Can.t locate })
+  {
+    print STDERR "[ignored warning, not recreate-related]\n";
+  } else {
+    ++$warning; 
+  }
+};
 
 my $spamtest = Mail::SpamAssassin->new({
     rules_filename => "$prefix/t/log/test_rules_copy",
@@ -38,6 +48,10 @@
     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);