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
Apply timeout to each newly created connection according to value of
[irspy-moved-to-github.git]
/
lib
/
ZOOM
/
IRSpy.pm
diff --git
a/lib/ZOOM/IRSpy.pm
b/lib/ZOOM/IRSpy.pm
index
c4bae34
..
736585c
100644
(file)
--- a/
lib/ZOOM/IRSpy.pm
+++ b/
lib/ZOOM/IRSpy.pm
@@
-1,4
+1,4
@@
-# $Id: IRSpy.pm,v 1.79 2007-03-29 11:54:53 mike Exp $
+# $Id: IRSpy.pm,v 1.81 2007-04-18 15:23:41 mike Exp $
package ZOOM::IRSpy;
package ZOOM::IRSpy;
@@
-257,7
+257,7
@@
sub _really_rewrite_record {
my $id = $xc->find("concat(e:serverInfo/e:host, ':',
e:serverInfo/e:port, '/',
e:serverInfo/e:database)");
my $id = $xc->find("concat(e:serverInfo/e:host, ':',
e:serverInfo/e:port, '/',
e:serverInfo/e:database)");
- if ($id ne $oldid) {
+ if (defined $oldid && $id ne $oldid) {
# Delete old record;
warn "IDs differ (old='$oldid' new='$id')";
my $p = $conn->package();
# Delete old record;
warn "IDs differ (old='$oldid' new='$id')";
my $p = $conn->package();
@@
-317,8
+317,12
@@
sub check {
or die "No tests defined for '$tname'";
$this->{tree}->resolve();
#$this->{tree}->print(0);
or die "No tests defined for '$tname'";
$this->{tree}->resolve();
#$this->{tree}->print(0);
- my $nskipped = 0;
+ my $topname = $this->{tree}->name();
+ my $timeout = "ZOOM::IRSpy::Test::$topname"->timeout();
+ $this->log("irspy", "beginnning with test '$topname' (timeout $timeout)");
+
+ my $nskipped = 0;
my @conn = @{ $this->{connections} };
my $nruns = 0;
my @conn = @{ $this->{connections} };
my $nruns = 0;
@@
-354,7
+358,8
@@
sub check {
$conn->destroy();
$conn[$i0] = create
ZOOM::IRSpy::Connection($this,
$conn->destroy();
$conn[$i0] = create
ZOOM::IRSpy::Connection($this,
- shift @{ $this->{queue} }, async => 1);
+ shift @{ $this->{queue} }, async => 1,
+ timeout => $timeout);
$conn[$i0]->option(current_test_address => "");
$conn[$i0]->log("irspy", "entering active pool - ",
scalar(@{ $this->{queue} }),
$conn[$i0]->option(current_test_address => "");
$conn[$i0]->log("irspy", "entering active pool - ",
scalar(@{ $this->{queue} }),