X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=736585c69ff5e92f226e5c8355c9c67877430941;hp=c4bae34cfe1f2d0b64ac2d85ab38af491fd737df;hb=0e124b9481a9b50b4d2110bdb264d31e0b35663f;hpb=b925f9017ccd6fcc0b4a164e361259d1cd7707ae

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index c4bae34..736585c 100644
--- 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;
 
@@ -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)");
-    if ($id ne $oldid) {
+    if (defined $oldid && $id ne $oldid) {
 	# 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);
-    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;
@@ -354,7 +358,8 @@ sub check {
 			    $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} }),