X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=705cf794a46b4cf17d040784971a37e09b0c5e0e;hb=cbe831541725dba6236b7fb31391c60311ec0f06;hp=71c84bddb1fb04c4002f061d0bfb801df2df90a0;hpb=f6f458afd90ddf96247162f1abd46d074feea12a;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 71c84bd..705cf79 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.8 2006-07-21 11:27:02 mike Exp $
+# $Id: IRSpy.pm,v 1.10 2006-07-21 11:50:17 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -49,6 +49,7 @@ sub new {
 	targets => undef,	# filled in later
 	target2record => undef,	# filled in later
 	pod => undef,		# filled in later
+	tests => [],		# stack of tests currently being executed
     }, $class;
     $this->log("irspy", "starting up with database '$dbname'");
 
@@ -79,7 +80,7 @@ sub targets {
 	my($host, $port, $db, $newtarget) = _parse_target_string($target);
 	if ($newtarget ne $target) {
 	    $this->log("irspy_debug", "rewriting '$target' to '$newtarget'");
-	    $target = $newtarget; ### Does this get written through the ref?
+	    $target = $newtarget; # This written through the ref
 	}
 	push @qlist,
 	    (qq[(host = "$host" and port = "$port" and path="$db")]);
@@ -100,7 +101,7 @@ sub _parse_target_string {
 	($host, $db) = ($target =~ /(.*?)\/(.*)/);
 	$target = "$host:$port/$db";
     }
-    die "invalid target string '$target'"
+    die "$0: invalid target string '$target'"
 	if !defined $host;
 
     return ($host, $port, $db, $target);
@@ -200,6 +201,10 @@ sub _run_test {
     my $this = shift();
     my($tname) = @_;
 
+    die("$0: test-hierarchy loop detected: " .
+	join(" -> ", @{ $this->{tests} }, $tname))
+	if grep { $_ eq $tname } @{ $this->{tests} };
+
     eval {
 	my $slashSeperatedTname = $tname;
 	$slashSeperatedTname =~ s/::/\//g;
@@ -211,8 +216,11 @@ sub _run_test {
     }
 
     $this->log("irspy", "running test '$tname'");
+    push @{ $this->{tests} }, $tname;
     my $test = "ZOOM::IRSpy::Test::$tname"->new($this);
-    return $test->run();
+    my $res =$test->run();
+    pop @{ $this->{tests} };
+    return $res;
 }