[Nagiosplug-checkins] nagiosplug/plugins/t check_ping.t,1.4,1.5

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/plugins/t
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7232/plugins/t

Modified Files:
	check_ping.t 
Log Message:
check_ping's timeout interval is only +1 if ping command has a timeout value.
Tests updated to check for 100% packet loss (always if ping has timeout), otherwise
will check for "timed out" string


Index: check_ping.t
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/t/check_ping.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- check_ping.t	11 Mar 2007 02:27:21 -0000	1.4
+++ check_ping.t	12 Mar 2007 10:51:06 -0000	1.5
@@ -9,7 +9,7 @@
 use Test::More;
 use NPTest;
 
-plan tests => 18;
+plan tests => 20;
 
 my $successOutput = '/PING (ok|OK) - Packet loss = +[0-9]{1,2}\%, +RTA = [\.0-9]+ ms/';
 my $failureOutput = '/Packet loss = +[0-9]{1,2}\%, +RTA = [\.0-9]+ ms/';
@@ -58,12 +58,38 @@
 is( $res->return_code, 2, "Old syntax, with forced critical" );
 like( $res->output, $failureOutput, "Output OK" );
 
+
+# check_ping results will depend on whether the ping command discovered by 
+# ./configure has a timeout option. If it does, then the timeout will
+# be set, so check_ping will always get a response. If it doesn't
+# then check_ping will timeout. We do 2 tests for check_ping's timeout
+#  - 1 second
+#  - 15 seconds 
+# The latter should be higher than normal ping timeouts, so should always give a packet loss result
+open(F, "../config.h") or die "Cannot open ../config.h";
+ at _ = grep /define PING_HAS_TIMEOUT 1|define PING_PACKETS_FIRST 1/, <F>;
+my $has_timeout;
+$has_timeout = 1 if (scalar @_ == 2);	# Need both defined
+close F;
 $res = NPTest->testCmd(
 	"./check_ping -H $host_nonresponsive -w 10,100% -c 10,100% -p 1 -t 1"
 	);
-is( $res->return_code, 2, "Timeout - host nonresponsive" );
+is( $res->return_code, 2, "Timeout 1 second - host nonresponsive" );
+if ($has_timeout) {
+	like( $res->output, '/100%/', "Error contains '100%' string (for 100% packet loss)" );
+} else {
+	like( $res->output, '/timed out/', "Error contains 'timed out' string" );
+}
+
+$res = NPTest->testCmd(
+	"./check_ping -H $host_nonresponsive -w 10,100% -c 10,100% -p 1 -t 15"
+	);
+is( $res->return_code, 2, "Timeout 15 seconds - host nonresponsive" );
 like( $res->output, '/100%/', "Error contains '100%' string (for 100% packet loss)" );
 
+
+
+
 $res = NPTest->testCmd(
 	"./check_ping $host_nonresponsive -p 1 -t 1 100 100 1000 10000"
 	);