Tweak irspy_connect() call to use new API with options hash.

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy / Test / Ping.pm

diff --git a/lib/ZOOM/IRSpy/Test/Ping.pm b/lib/ZOOM/IRSpy/Test/Ping.pm
index 590b94d..52c002d 100644 (file)
--- a/lib/ZOOM/IRSpy/Test/Ping.pm
+++ b/lib/ZOOM/IRSpy/Test/Ping.pm
@@ -1,4 +1,4 @@
-# $Id: Ping.pm,v 1.4 2006-06-21 16:26:29 mike Exp $
+# $Id: Ping.pm,v 1.14 2006-10-25 10:49:37 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -9,29 +9,31 @@ 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);
-    my $err = $pod->wait($irspy);
-
-    return 0;
+    $conn->irspy_connect(undef, {},
+                        ZOOM::Event::CONNECT, \&connected,
+                        exception => \&not_connected);
 }
 
 
-sub connected {
-    my($conn, $irspy, $rs, $event) = @_;
+sub connected { maybe_connected(@_, 1) }
+sub not_connected { maybe_connected(@_, 0) }
+
+sub maybe_connected {
+    my($conn, $task, $__UNUSED_udata, $event, $ok) = @_;
 
-    my $rec = $irspy->record($conn);
-    $irspy->log("irspy_test", $conn->option("host"), " connected");
-    ### Note the successful connection in $rec
-    return 0;
+    $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;
 }