projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
complete error timeout handling for all tests
[irspy-moved-to-github.git]
/
lib
/
ZOOM
/
IRSpy
/
Test
/
Search
/
Dan1.pm
diff --git
a/lib/ZOOM/IRSpy/Test/Search/Dan1.pm
b/lib/ZOOM/IRSpy/Test/Search/Dan1.pm
index
9e344e6
..
415c5aa
100644
(file)
--- a/
lib/ZOOM/IRSpy/Test/Search/Dan1.pm
+++ b/
lib/ZOOM/IRSpy/Test/Search/Dan1.pm
@@
-1,4
+1,3
@@
-# $Id: Dan1.pm,v 1.4 2006-10-26 10:24:20 sondberg Exp $
# See the "Main" test package for documentation
# See the "Main" test package for documentation
@@
-21,7
+20,7
@@
sub start {
foreach my $attr (@attrs) {
$conn->irspy_search_pqf("\@attr dan1 1=$attr mineral",
{'attr' => $attr}, {},
foreach my $attr (@attrs) {
$conn->irspy_search_pqf("\@attr dan1 1=$attr mineral",
{'attr' => $attr}, {},
- ZOOM::Event::RECV_SEARCH, \&found,
+ ZOOM::Event::ZEND, \&found,
exception => \&error);
}
}
exception => \&error);
}
}
@@
-30,8
+29,9
@@
sub start {
sub found {
my($conn, $task, $test_args, $event) = @_;
my $attr = $test_args->{'attr'};
sub found {
my($conn, $task, $test_args, $event) = @_;
my $attr = $test_args->{'attr'};
- my $n = $task->{rs}->size();
+ my $n = $task->{rs}->size();
+ $task->{rs}->destroy();
$conn->log("irspy_test", "search on access-point $attr found $n record",
$n==1 ? "" : "s");
update($conn, $attr, 1);
$conn->log("irspy_test", "search on access-point $attr found $n record",
$n==1 ? "" : "s");
update($conn, $attr, 1);
@@
-44,10
+44,13
@@
sub error {
my($conn, $task, $test_args, $exception) = @_;
my $attr = $test_args->{'attr'};
my($conn, $task, $test_args, $exception) = @_;
my $attr = $test_args->{'attr'};
+ $task->{rs}->destroy();
$conn->log("irspy_test", "search on access-point $attr had error: ",
$exception);
update($conn, $attr, 0);
$conn->log("irspy_test", "search on access-point $attr had error: ",
$exception);
update($conn, $attr, 0);
+ zoom_error_timeout_update($conn, $exception);
+ ### How about TEST_BAD if $exception->code() == 121?
return ZOOM::IRSpy::Status::TASK_DONE;
}
return ZOOM::IRSpy::Status::TASK_DONE;
}
@@
-55,7
+58,7
@@
sub error {
sub update {
my ($conn, $attr, $ok) = @_;
sub update {
my ($conn, $attr, $ok) = @_;
- $conn->record()->store_result('search', 'set' => 'dan1',
+ $conn->record()->store_result('search', 'set' => 'dan-1',
'ap' => $attr,
'ok' => $ok);
}
'ap' => $attr,
'ok' => $ok);
}