X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FPing.pm;h=77e9805966d42c834b80f38f629ea72d3dd1fc18;hb=1c2598aeac397399e015f5c1a83ab036a98e3938;hp=af61b3cd8561d292815f0df0eafcf0be668197ce;hpb=3b59bc342d83d4d0d8d0c7083728278bdc5dbea4;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Test/Ping.pm b/lib/ZOOM/IRSpy/Test/Ping.pm
index af61b3c..77e9805 100644
--- a/lib/ZOOM/IRSpy/Test/Ping.pm
+++ b/lib/ZOOM/IRSpy/Test/Ping.pm
@@ -1,4 +1,4 @@
-# $Id: Ping.pm,v 1.6 2006-07-18 10:40:13 mike Exp $
+# $Id: Ping.pm,v 1.13 2006-10-12 14:37:24 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -9,20 +9,16 @@ use strict;
 use warnings;
 
 use ZOOM::IRSpy::Test;
-our @ISA;
-@ISA = qw(ZOOM::IRSpy::Test);
+our @ISA = qw(ZOOM::IRSpy::Test);
 
 
-sub run {
-    my $this = shift();
-    my $irspy = $this->irspy();
-    my $pod = $irspy->pod();
+sub start {
+    my $class = shift();
+    my($conn) = @_;
 
-    $pod->callback(ZOOM::Event::CONNECT, \&connected);
-    $pod->callback("exception", \&not_connected);
-    my $err = $pod->wait($irspy);
-
-    return 0;
+    $conn->irspy_connect(undef,
+			 ZOOM::Event::CONNECT, \&connected,
+			 exception => \&not_connected);
 }
 
 
@@ -30,14 +26,14 @@ sub connected { maybe_connected(@_, 1) }
 sub not_connected { maybe_connected(@_, 0) }
 
 sub maybe_connected {
-    my($conn, $irspy, $rs, $event, $ok) = @_;
-
-    my $rec = $irspy->record($conn);
-    $irspy->log("irspy_test", $conn->option("host"),
-		($ok ? "" : " not"), " connected");
-    $rec->failed(1) if !$ok;
-    ### At this point we should note the successful connection in $rec
-    return 0;
+    my($conn, $task, $__UNUSED_udata, $event, $ok) = @_;
+
+    $conn->log("irspy_test", ($ok ? "" : "not "), "connected");
+    my $rec = $conn->record();
+    $rec->append_entry("irspy:status", "<irspy:probe ok='$ok'>" .
+		       isodate(time()) . "</irspy:probe>");
+    $conn->option(pod_omit => 1) if !$ok;
+    return ZOOM::IRSpy::Status::TASK_DONE;
 }