svn commit: r884667 - in /spamassassin/trunk: t/SATest.pm t/sa_compile.t xt/20_saw_ampersand.t

[mm...@apache.org]

Author: mmartinec
Date: Thu Nov 26 19:04:02 2009
New Revision: 884667

URL: http://svn.apache.org/viewvc?rev=884667&view=rev
Log:
SATest.pm: include errno of a failing copy command in error messages;
SATest.pm and 20_saw_ampersand.t: add some missing status tests and
report failures; turn off debugging in sa_compile.t to reduce noise

Modified:
    spamassassin/trunk/t/SATest.pm
    spamassassin/trunk/t/sa_compile.t
    spamassassin/trunk/xt/20_saw_ampersand.t

Modified: spamassassin/trunk/t/SATest.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/SATest.pm?rev=884667&r1=884666&r2=884667&view=diff
==============================================================================
--- spamassassin/trunk/t/SATest.pm (original)
+++ spamassassin/trunk/t/SATest.pm Thu Nov 26 19:04:02 2009
@@ -147,13 +147,13 @@
     my $file = $1;
     $base = basename $file;
     copy ($file, "log/test_rules_copy/$base")
-      or warn "cannot copy $file to log/test_rules_copy/$base";
+      or warn "cannot copy $file to log/test_rules_copy/$base: $!";
   }
 
   copy ("data/01_test_rules.pre", "log/test_rules_copy/01_test_rules.pre")
-    or warn "cannot copy data/01_test_rules.cf to log/test_rules_copy/01_test_rules.pre";
+    or warn "cannot copy data/01_test_rules.cf to log/test_rules_copy/01_test_rules.pre: $!";
   copy ("data/01_test_rules.cf", "log/test_rules_copy/01_test_rules.cf")
-    or warn "cannot copy data/01_test_rules.cf to log/test_rules_copy/01_test_rules.cf";
+    or warn "cannot copy data/01_test_rules.cf to log/test_rules_copy/01_test_rules.cf: $!";
 
   rmtree ("log/localrules.tmp");
   mkdir ("log/localrules.tmp", 0755);
@@ -163,18 +163,24 @@
     my $file = $1;
     $base = basename $file;
     copy ($file, "log/localrules.tmp/$base")
-      or warn "cannot copy $file to log/localrules.tmp/$base";
+      or warn "cannot copy $file to log/localrules.tmp/$base: $!";
   }
 
   copy ("../rules/user_prefs.template", "log/test_rules_copy/99_test_default.cf")
-    or die "user prefs copy failed";
+    or die "user prefs copy failed: $!";
 
-  open (PREFS, ">>log/test_rules_copy/99_test_default.cf");
-  print PREFS $default_cf_lines;
-  close PREFS;
+  open (PREFS, ">>log/test_rules_copy/99_test_default.cf")
+    or die "cannot append to log/test_rules_copy/99_test_default.cf: $!";
+  print PREFS $default_cf_lines
+    or die "error writing to log/test_rules_copy/99_test_default.cf: $!";
+  close PREFS
+    or die "error closing log/test_rules_copy/99_test_default.cf: $!";
 
   # create an empty .prefs file
-  open (PREFS, ">>log/test_default.cf"); close PREFS;
+  open (PREFS, ">>log/test_default.cf")
+    or die "cannot append to log/test_default.cf: $!";
+  close PREFS
+    or die "error closing log/test_default.cf: $!";
 
   mkdir("log/user_state",$tmp_dir_mode);
   chmod ($tmp_dir_mode, "log/user_state");  # unaffected by umask
@@ -786,7 +792,7 @@
 
   if (!open (CF, "<${prefix}config")) {
     if (!open (CF, "<${prefix}config.dist")) {   # fall back to defaults
-      die "cannot open test suite configuration file 'config.dist'";
+      die "cannot open test suite configuration file 'config.dist': $!";
     }
   }
 

Modified: spamassassin/trunk/t/sa_compile.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sa_compile.t?rev=884667&r1=884666&r2=884667&view=diff
==============================================================================
--- spamassassin/trunk/t/sa_compile.t (original)
+++ spamassassin/trunk/t/sa_compile.t Thu Nov 26 19:04:02 2009
@@ -117,7 +117,7 @@
 
 # -------------------------------------------------------------------
 
-system_or_die "$instdir/foo/bin/sa-compile --debug --keep-tmps";
+system_or_die "$instdir/foo/bin/sa-compile --keep-tmps";  # --debug
 %patterns = (
 
   q{ able to use 1/1 'body_0' compiled rules }, 'able-to-use',

Modified: spamassassin/trunk/xt/20_saw_ampersand.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/xt/20_saw_ampersand.t?rev=884667&r1=884666&r2=884667&view=diff
==============================================================================
--- spamassassin/trunk/xt/20_saw_ampersand.t (original)
+++ spamassassin/trunk/xt/20_saw_ampersand.t Thu Nov 26 19:04:02 2009
@@ -16,7 +16,7 @@
 use SATest; sa_t_init("saw_ampersand");
 
 use Test::More;
-plan tests => 40;
+plan tests => 37;
 
 use Carp qw(croak);
 
@@ -39,14 +39,14 @@
         (<log/localrules.tmp/*.pre>, <log/test_rules_copy/*.pre>) #*/
 {
   rename $file, "$file.bak" or die "rename $file failed";
-  open IN, "<$file.bak" or die "cannot read $file.bak";
-  open OUT, ">$file" or die "cannot write $file";
+  open IN, "<$file.bak" or die "cannot read $file.bak: $!";
+  open OUT, ">$file" or die "cannot write $file: $!";
   while (<IN>) {
     s/^loadplugin/###loadplugin/g;
     print OUT;
   }
-  close IN;
-  close OUT;
+  close IN  or die "error closing $file.bak: $!";
+  close OUT or die "error closing $file: $!";
 }
 
 
@@ -146,9 +146,12 @@
 
 sub write_plugin_pre {
   my $cftext = shift;
-  open OUT, ">log/localrules.tmp/test.pre";
-  print OUT $cftext;
-  close OUT or die;
+  open OUT, ">log/localrules.tmp/test.pre"
+    or die "cannot create log/localrules.tmp/test.pre: $!";
+  print OUT $cftext
+    or die "error writing to log/localrules.tmp/test.pre: $!";
+  close OUT
+    or die "cannot close log/localrules.tmp/test.pre: $!";
 }
 
 sub tryone {
@@ -163,15 +166,15 @@
     'dont_copy_prefs' => 1,
     # 'debug' => 1,
     'local_tests_only' => $ltests,
-    'post_config_text' => $cftext
+    'post_config_text' => $cftext,
   });
 
   $sa->init(1);
   ok($sa);
 
-  open (IN, "<data/spam/009");
-  my $mail = $sa->parse(\*IN);
-  close IN;
+  open (IN, "<data/spam/009") or die "cannot open data/spam/009: $!";
+  my $mail = $sa->parse(\*IN,0);
+  close IN or die "error closing data/spam/009: $!";
 
   my $status = $sa->check($mail);
   my $rewritten = $status->rewrite_mail();