- Just-in-time output in notif tests

- Purge test also purges and tests jobs in state 'done'
- Sandbox Transfer test purges its testing jobs when done.

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-notif-recovery.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-notif-recovery.sh
index 14bd023..0a84dc2 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-notif-recovery.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-notif-recovery.sh
@@ -80,11 +80,11 @@ do
 done
 
 # redirecting all output to $logfile
-touch $logfile
-if [ ! -w $logfile ]; then
-       echo "Cannot write to output file $logfile"
-       exit $TEST_ERROR
-fi
+#touch $logfile
+#if [ ! -w $logfile ]; then
+#      echo "Cannot write to output file $logfile"
+#      exit $TEST_ERROR
+#fi
 
 DEBUG=2
 
@@ -188,11 +188,12 @@ else
 fi
 
 test_end
-} &> $logfile
+}
+#} &> $logfile
 
-if [ $flag -ne 1 ]; then
-       cat $logfile
-       $SYS_RM $logfile
-fi
+#if [ $flag -ne 1 ]; then
+#      cat $logfile
+#      $SYS_RM $logfile
+#fi
 exit $TEST_OK
 

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh
index 30f890e..cf65f14 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh
@@ -80,11 +80,11 @@ do
 done
 
 # redirecting all output to $logfile
-touch $logfile
-if [ ! -w $logfile ]; then
-       echo "Cannot write to output file $logfile"
-       exit $TEST_ERROR
-fi
+#touch $logfile
+#if [ ! -w $logfile ]; then
+#      echo "Cannot write to output file $logfile"
+#      exit $TEST_ERROR
+#fi
 
 DEBUG=2
 
@@ -187,11 +187,12 @@ else
 fi
 
 test_end
-} &> $logfile
+} 
+#} &> $logfile
 
-if [ $flag -ne 1 ]; then
-       cat $logfile
-       $SYS_RM $logfile
-fi
+#if [ $flag -ne 1 ]; then
+#      cat $logfile
+#      $SYS_RM $logfile
+#fi
 exit $TEST_OK
 

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-purge.pl b/org.glite.testsuites.ctb/LB/tests/lb-test-purge.pl
index e176dbd..6241b7a 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-purge.pl
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-purge.pl
@@ -68,7 +68,7 @@ sub logit {
        my $prefix = shift;
        my $failed = 0;
 
-       for (qw/aborted cleared cancelled waiting/) {
+       for (qw/aborted cleared cancelled waiting done/) {
                my $key = $_ eq waiting ? 'other' : $_;
                $id = `$test/glite-lb-$_.sh -m $server 2> /dev/null`;
                chomp $id;
@@ -114,7 +114,7 @@ sub test_printf {
 
 
 test_printf ("** Hey, purging the whole database...");
-system "$purge --server $server --return-list --aborted=0 --cleared=0 --cancelled=0 --other=0";
+system "$purge --server $server --return-list --aborted=0 --cleared=0 --cancelled=0 --done=0 --other=0";
 if ($!) {
        test_failed();
        die "$purge: $!\n";
@@ -148,7 +148,7 @@ sleep $drain;
 
 test_printf ("** test jobs:\n");
 
-for (qw/aborted cleared cancelled other/) {
+for (qw/aborted cleared cancelled done other/) {
        print "$_:\n\t$old{$_}\n\t$new{$_}\n";
 } 
 
@@ -156,7 +156,7 @@ test_printf ("** Dry run\n");
 $failed = 0;
 
 $half = $delay/2;
-for (qw/aborted cleared cancelled other/) {
+for (qw/aborted cleared cancelled done other/) {
        open LIST,"$purge --server $server --dry-run --return-list --$_=${half}s| grep '^https://'|" or die "!! run $purge\n"; 
 
        $id = <LIST>; chomp $id;
@@ -229,7 +229,7 @@ test_done();
 
 test_printf ("** Purge the first set of jobs\n");
 
-open DUMP,"$purge --server $server --server-dump --aborted=${half}s --cleared=${half}s --cancelled=${half}s --other=${half}s | grep '^Server dump:'|"
+open DUMP,"$purge --server $server --server-dump --aborted=${half}s --cleared=${half}s --cancelled=${half}s --done=${half}s --other=${half}s | grep '^Server dump:'|"
        or die "!! run $purge\n";
 
 $dump = <DUMP>; chomp $dump; $dump =~ s/Server dump: //;
@@ -252,7 +252,7 @@ print "diff OK ";
 test_done();
 
 test_printf ("** Purge the rest\n");
-open DUMP,"$purge --server $server --server-dump --aborted=0 --cleared=0 --cancelled=0 --other=0 | grep '^Server dump:'|"
+open DUMP,"$purge --server $server --server-dump --aborted=0 --cleared=0 --cancelled=0 --done=0 --other=0 | grep '^Server dump:'|"
        or die "!! run $purge\n";
 
 $dump = <DUMP>; chomp $dump; $dump =~ s/Server dump: //;
@@ -272,7 +272,7 @@ test_done();
 
 
 test_printf ("** Anything left?\n");
-open LIST,"$purge --server $server --return-list --dry-run --aborted=0 --cleared=0 --cancelled=0 --other=0 | grep '^https://'|" or die "!! $purge\n";
+open LIST,"$purge --server $server --return-list --dry-run --aborted=0 --cleared=0 --cancelled=0 --done=0 --other=0 | grep '^https://'|" or die "!! $purge\n";
 
 $id = <LIST>;
 close LIST;

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh
index cc29b56..9e8a1f5 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh
@@ -361,6 +361,14 @@ else
                                                printf "$isbjobid"
                                                test_done
 
+                                               # Prepare list for future purge
+
+                                               joblist=$$_jobs_to_purge.txt
+                                               echo $jobid > ${joblist}
+                                               echo $isbjobid >> ${joblist}
+                                               echo $isbsubjobid0 >> ${joblist}
+                                               echo $isbsubjobid1 >> ${joblist}
+
                                                # Check relations
 
                                                printf "Check ISB transfer JobID for computing job... "
@@ -645,6 +653,7 @@ else
                                                        print_error "'DONE_CODE_OK' was expected"
                                                fi
 
+                                               try_purge ${joblist}
 
                                        fi
                                fi