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
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
a105a28
..
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.9 2006-07-24 16:16:29 mike Exp $
+# $Id: Ping.pm,v 1.14 2006-10-25 10:49:37 mike Exp $
# See the "Main" test package for documentation
# See the "Main" test package for documentation
@@
-9,20
+9,16
@@
use strict;
use warnings;
use ZOOM::IRSpy::Test;
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", \¬_connected);
- my $err = $pod->wait($irspy);
-
- return 0;
+ $conn->irspy_connect(undef, {},
+ ZOOM::Event::CONNECT, \&connected,
+ exception => \¬_connected);
}
}
@@
-30,24
+26,14
@@
sub connected { maybe_connected(@_, 1) }
sub not_connected { maybe_connected(@_, 0) }
sub maybe_connected {
sub not_connected { maybe_connected(@_, 0) }
sub maybe_connected {
- my($conn, $irspy, $rs, $event, $ok) = @_;
+ my($conn, $task, $__UNUSED_udata, $event, $ok) = @_;
- my $rec = $irspy->record($conn);
- $irspy->log("irspy_test", $conn->option("host"),
- ($ok ? "" : " not"), " connected");
+ $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;
$rec->append_entry("irspy:status", "<irspy:probe ok='$ok'>" .
isodate(time()) . "</irspy:probe>");
$conn->option(pod_omit => 1) if !$ok;
- return 0;
-}
-
-
-sub isodate {
- my($time) = @_;
-
- my($sec, $min, $hour, $mday, $mon, $year) = localtime($time);
- return sprintf("%04d-%02d-%02dT%02d:%02d:%02d",
- $year+1900, $mon+1, $mday, $hour, $min, $sec);
+ return ZOOM::IRSpy::Status::TASK_DONE;
}
}