Mailing List Archive

Author: jm
Date: Thu Dec 14 07:47:47 2006
New Revision: 487243

URL: http://svn.apache.org/viewvc?view=rev&rev=487243
Log:
tidy up test log output; t/log/NAMEOFTEST/TESTNUM is the new format

Modified:
spamassassin/trunk/t/SATest.pm
spamassassin/trunk/t/spamd_kill_restart.t
spamassassin/trunk/t/spamd_kill_restart_rr.t
spamassassin/trunk/t/spamd_plugin.t
spamassassin/trunk/t/strip2.t
spamassassin/trunk/t/strip_no_subject.t

Modified: spamassassin/trunk/t/SATest.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/SATest.pm?view=diff&rev=487243&r1=487242&r2=487243
==============================================================================
--- spamassassin/trunk/t/SATest.pm (original)
+++ spamassassin/trunk/t/SATest.pm Thu Dec 14 07:47:47 2006
@@ -243,10 +243,11 @@
my $scrargs = "$scr $args";
$scrargs =~ s!/!\\!g if ($^O =~ /^MS(DOS|Win)/i);
print ("\t$scrargs\n");
- system ("$scrargs > log/$testname.${Test::ntest} $post_redir");
+ (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755);
+ system ("$scrargs > log/d.$testname/${Test::ntest} $post_redir");
$sa_exitcode = ($?>>8);
if ($sa_exitcode != 0) { return undef; }
- &checkfile ("$testname.${Test::ntest}", $read_sub) if (defined $read_sub);
+ &checkfile ("d.$testname/${Test::ntest}", $read_sub) if (defined $read_sub);
1;
}

@@ -277,10 +278,11 @@
my $salearnargs = "$salearn $args";
$salearnargs =~ s!/!\\!g if ($^O =~ /^MS(DOS|Win)/i);
print ("\t$salearnargs\n");
- system ("$salearnargs > log/$testname.${Test::ntest}");
+ (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755);
+ system ("$salearnargs > log/d.$testname/${Test::ntest}");
$salearn_exitcode = ($?>>8);
if ($salearn_exitcode != 0) { return undef; }
- &checkfile ("$testname.${Test::ntest}", $read_sub) if (defined $read_sub);
+ &checkfile ("d.$testname/${Test::ntest}", $read_sub) if (defined $read_sub);
1;
}

@@ -316,10 +318,11 @@
$spamcargs =~ s!/!\\!g if ($^O =~ /^MS(DOS|Win)/i);

print ("\t$spamcargs\n");
+ (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755);
if ($capture_stderr) {
- system ("$spamcargs > log/$testname.out 2>&1");
+ system ("$spamcargs > log/d.$testname/out.${Test::ntest} 2>&1");
} else {
- system ("$spamcargs > log/$testname.out");
+ system ("$spamcargs > log/d.$testname/out.${Test::ntest}");
}

$sa_exitcode = ($?>>8);
@@ -327,7 +330,7 @@

%found = ();
%found_anti = ();
- &checkfile ("$testname.out", $read_sub) if (defined $read_sub);
+ &checkfile ("d.$testname/out.${Test::ntest}", $read_sub) if (defined $read_sub);

($sa_exitcode == 0);
}
@@ -352,7 +355,8 @@
$spamcargs =~ s!/!\\!g if ($^O =~ /^MS(DOS|Win)/i);

print ("\t$spamcargs &\n");
- system ("$spamcargs > log/$testname.bg &") and return 0;
+ (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755);
+ system ("$spamcargs > log/d.$testname/bg.${Test::ntest} &") and return 0;

1;
}
@@ -369,6 +373,7 @@
1;
}

+# out: $spamd_stderr
sub start_spamd {

return if $SKIP_SPAMD_TESTS;
@@ -412,9 +417,11 @@
warn "oops! SATest.pm: a test prefs file was created, but spamd isn't reading it\n";
}

- my $spamd_stdout = "log/$testname-spamd.out";
- my $spamd_stderr = "log/$testname-spamd.err";
- my $spamd_stdlog = "log/$testname-spamd.log";
+ (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755);
+ my $spamd_stdout = "log/d.$testname/spamd.out.${Test::ntest}";
+ $spamd_stderr = "log/d.$testname/spamd.err.${Test::ntest}"; # global
+ my $spamd_stdlog = "log/d.$testname/spamd.log.${Test::ntest}";
+
my $spamd_forker = $ENV{'SPAMD_FORKER'} ?
$ENV{'SPAMD_FORKER'} :
$RUNNING_ON_WINDOWS ?

Modified: spamassassin/trunk/t/spamd_kill_restart.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_kill_restart.t?view=diff&rev=487243&r1=487242&r2=487243
==============================================================================
--- spamassassin/trunk/t/spamd_kill_restart.t (original)
+++ spamassassin/trunk/t/spamd_kill_restart.t Thu Dec 14 07:47:47 2006
@@ -43,7 +43,6 @@
# override these so the old logs are still visible and the new
# spamd will be started even though stop_spamd() was not called
$spamd_pid = 0;
- $testname = "spamd_kill_restart_retry_".$retry;

dbgprint "starting new spamd, loop try $retry...\n";
start_spamd("-D -L -r ${pid_file}");

Modified: spamassassin/trunk/t/spamd_kill_restart_rr.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_kill_restart_rr.t?view=diff&rev=487243&r1=487242&r2=487243
==============================================================================
--- spamassassin/trunk/t/spamd_kill_restart_rr.t (original)
+++ spamassassin/trunk/t/spamd_kill_restart_rr.t Thu Dec 14 07:47:47 2006
@@ -43,7 +43,6 @@
# override these so the old logs are still visible and the new
# spamd will be started even though stop_spamd() was not called
$spamd_pid = 0;
- $testname = "spamd_kill_restart_rr_retry_".$retry;

dbgprint "starting new spamd, loop try $retry...\n";
start_spamd("-D -L --round-robin -r ${pid_file}");

Modified: spamassassin/trunk/t/spamd_plugin.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_plugin.t?view=diff&rev=487243&r1=487242&r2=487243
==============================================================================
--- spamassassin/trunk/t/spamd_plugin.t (original)
+++ spamassassin/trunk/t/spamd_plugin.t Thu Dec 14 07:47:47 2006
@@ -31,21 +31,21 @@
);
ok (spamcrun ("-U $sockpath < data/spam/001", \&patterns_run_cb));

-checkfile("spamd_plugin-spamd.err", \&patterns_run_cb);
+checkfile($spamd_stderr, \&patterns_run_cb);
ok_all_patterns();

%patterns = (
q{ called myTestPlugin, round 2 }, 'called2'
);
ok (spamcrun ("-U $sockpath < data/nice/001", \&patterns_run_cb));
-checkfile("spamd_plugin-spamd.err", \&patterns_run_cb);
+checkfile($spamd_stderr, \&patterns_run_cb);
ok_all_patterns();

%patterns = (
q{ called myTestPlugin, round 3 }, 'called3'
);
ok (spamcrun ("-U $sockpath < data/nice/001", \&patterns_run_cb));
-checkfile("spamd_plugin-spamd.err", \&patterns_run_cb);
+checkfile($spamd_stderr, \&patterns_run_cb);
ok_all_patterns();

stop_spamd();

Modified: spamassassin/trunk/t/strip2.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/strip2.t?view=diff&rev=487243&r1=487242&r2=487243
==============================================================================
--- spamassassin/trunk/t/strip2.t (original)
+++ spamassassin/trunk/t/strip2.t Thu Dec 14 07:47:47 2006
@@ -34,9 +34,9 @@

# create report_safe 0 output
sarun ("-L < $INPUT");
- if (move("log/$testname.${Test::ntest}", $MUNGED)) {
+ if (move("log/d.$testname/${Test::ntest}", $MUNGED)) {
sarun ("-d < $MUNGED");
- ok(!compare_text($INPUT,"log/$testname.${Test::ntest}"));
+ ok(!compare_text($INPUT,"log/d.$testname/${Test::ntest}"));
}
else {
warn "move failed: $!\n";
@@ -52,9 +52,9 @@

# create report_safe 1 and -t output
sarun ("-L -t < $INPUT");
- if (move("log/$testname.${Test::ntest}", $MUNGED)) {
+ if (move("log/d.$testname/${Test::ntest}", $MUNGED)) {
sarun ("-d < $MUNGED");
- ok(!compare_text($INPUT,"log/$testname.${Test::ntest}"));
+ ok(!compare_text($INPUT,"log/d.$testname/${Test::ntest}"));
}
else {
warn "move failed: $!\n";
@@ -75,9 +75,9 @@

# create report_safe 2 output
sarun ("-L < $INPUT");
-if (move("log/$testname.${Test::ntest}", $MUNGED)) {
+if (move("log/d.$testname/${Test::ntest}", $MUNGED)) {
sarun ("-d < $MUNGED");
- ok(!compare_text($INPUT,"log/$testname.${Test::ntest}"));
+ ok(!compare_text($INPUT,"log/d.$testname/${Test::ntest}"));
}
else {
warn "move failed: $!\n";
@@ -86,5 +86,5 @@

# Work directly on regular message, as though it was not spam
sarun ("-d < $INPUT");
-ok(!compare_text($INPUT,"log/$testname.${Test::ntest}"));
+ok(!compare_text($INPUT,"log/d.$testname/${Test::ntest}"));


Modified: spamassassin/trunk/t/strip_no_subject.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/strip_no_subject.t?view=diff&rev=487243&r1=487242&r2=487243
==============================================================================
--- spamassassin/trunk/t/strip_no_subject.t (original)
+++ spamassassin/trunk/t/strip_no_subject.t Thu Dec 14 07:47:47 2006
@@ -20,9 +20,9 @@

# create report_safe 1 and -t output
sarun ("-L -t < $INPUT");
-if (move("log/$testname.${Test::ntest}", $MUNGED)) {
+if (move("log/d.$testname/${Test::ntest}", $MUNGED)) {
sarun ("-d < $MUNGED");
- ok(!compare_text($INPUT,"log/$testname.${Test::ntest}"));
+ ok(!compare_text($INPUT,"log/d.$testname/${Test::ntest}"));
}
else {
warn "move failed: $!\n";
@@ -37,9 +37,9 @@

# create report_safe 2 output
sarun ("-L < $INPUT");
-if (move("log/$testname.${Test::ntest}", $MUNGED)) {
+if (move("log/d.$testname/${Test::ntest}", $MUNGED)) {
sarun ("-d < $MUNGED");
- ok(!compare_text($INPUT,"log/$testname.${Test::ntest}"));
+ ok(!compare_text($INPUT,"log/d.$testname/${Test::ntest}"));
}
else {
warn "move failed: $!\n";
@@ -54,9 +54,9 @@

# create report_safe 0 output
sarun ("-L < $INPUT");
-if (move("log/$testname.${Test::ntest}", $MUNGED)) {
+if (move("log/d.$testname/${Test::ntest}", $MUNGED)) {
sarun ("-d < $MUNGED");
- ok(!compare_text($INPUT,"log/$testname.${Test::ntest}"));
+ ok(!compare_text($INPUT,"log/d.$testname/${Test::ntest}"));
}
else {
warn "move failed: $!\n";
@@ -65,4 +65,4 @@

# Work directly on regular message, as though it was not spam
sarun ("-d < $INPUT");
-ok(!compare_text($INPUT,"log/$testname.${Test::ntest}"));
+ok(!compare_text($INPUT,"log/d.$testname/${Test::ntest}"));