-# $Id: IRSpy.pm,v 1.47 2006-11-02 13:16:49 mike Exp $
+# $Id: IRSpy.pm,v 1.50 2006-11-20 15:06:46 mike Exp $
package ZOOM::IRSpy;
use ZOOM::IRSpy::Node;
use ZOOM::IRSpy::Connection;
use ZOOM::IRSpy::Record;
-use ZOOM::IRSpy::Utils;
+use ZOOM::IRSpy::Utils qw(cql_target);
our @ISA = qw();
our $VERSION = '0.02';
sub TASK_DONE { 18 } # Task is complete, next task should begin
sub TEST_GOOD { 8 } # Whole test is complete, and succeeded
sub TEST_BAD { 31 } # Whole test is complete, and failed
+sub TEST_SKIPPED { 12 } # Test couldn't be run
package ZOOM::IRSpy;
$this->log("irspy_debug", "rewriting '$target' to '$newtarget'");
$target = $newtarget; # This is written through the ref
}
- push @qlist, (qq[(host="$host" and port="$port" and path="$db")]);
+ push @qlist, cql_target($host, $port, $db);
}
$this->{targets} = \@targets;
$nskipped += $n;
}
}
+
+ } elsif ($res == ZOOM::IRSpy::Status::TEST_SKIPPED) {
+ $conn->log("irspy_task", "test skipped during task $task");
+ $conn->current_task(0);
+ $conn->next_task(0);
+ # I think that's all we need to do
+
} else {
die "unknown callback return-value '$res'";
}
warn "$conn still has a queued task $task";
}
if (!$conn->is_idle()) {
- warn "$conn is not idle (still has ZOOM-C level tasks queued)";
+ warn "$conn still has ZOOM-C level tasks queued: see below";
}
if (!$conn->option("rewrote_record")) {
warn "$conn did not rewrite its ZeeRex record";
}
}
+ # This shouldn't happen emit anything either:
+ @conn = @{ $this->{connections} };
+ while (my $i1 = ZOOM::event(\@conn)) {
+ my $conn = $conn[$i1-1];
+ my $ev = $conn->last_event();
+ my $evstr = ZOOM::event_str($ev);
+ warn "$conn still has ZOOM-C level task queued: $ev ($evstr)";
+ }
+
return $nskipped;
}