2 files changed, 133 insertions, 18 deletions

diff --git a/plugins-root/t/check_icmp.t b/plugins-root/t/check_icmp.t
new file mode 100644
index 00000000..2241f4d0
--- /dev/null
+++ b/plugins-root/t/check_icmp.t
@@ -0,0 +1,68 @@
+#! /usr/bin/perl -w -I ..
+#
+# Ping Response Tests via check_icmp
+#
+# $Id$
+#
+
+use strict;
+use Test::More;
+use NPTest;
+
+my $allow_sudo = getTestParameter( "NP_ALLOW_SUDO",
+        "If sudo is setup for this user to run any command as root ('yes' to allow)",
+        "no" );
+
+if ($allow_sudo eq "yes") {
+        plan tests => 10;
+} else {
+        plan skip_all => "Need sudo to test check_icmp";
+}
+
+my $successOutput = '/OK - .*?: rta [\d\.]+ms, lost \d%/';
+my $failureOutput = '/(WARNING|CRITICAL) - .*?: rta [\d\.]+ms, lost \d%/';
+
+my $host_responsive    = getTestParameter( "NP_HOST_RESPONSIVE",
+                                "The hostname of system responsive to network requests",
+                                "localhost" );
+
+my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE",
+                                "The hostname of system not responsive to network requests",
+                                "10.0.0.1" );
+
+my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
+                                "An invalid (not known to DNS) hostname",
+                                "nosuchhost" );
+
+my $res;
+
+$res = NPTest->testCmd(
+        "sudo ./check_icmp -H $host_responsive -w 10000ms,100% -c 10000ms,100%"
+        );
+is( $res->return_code, 0, "Syntax ok" );
+like( $res->output, $successOutput, "Output OK" );
+
+$res = NPTest->testCmd(
+        "sudo ./check_icmp -H $host_responsive -w 0ms,0% -c 10000ms,100%"
+        );
+is( $res->return_code, 1, "Syntax ok, with forced warning" );
+like( $res->output, $failureOutput, "Output OK" );
+
+$res = NPTest->testCmd(
+        "sudo ./check_icmp -H $host_responsive -w 0,0% -c 0,0%"
+        );
+is( $res->return_code, 2, "Syntax ok, with forced critical" );
+like( $res->output, $failureOutput, "Output OK" );
+
+$res = NPTest->testCmd(
+        "sudo ./check_icmp -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100%"
+        );
+is( $res->return_code, 2, "Timeout - host nonresponsive" );
+like( $res->output, '/100%/', "Error contains '100%' string (for 100% packet loss)" );
+
+$res = NPTest->testCmd(
+        "sudo ./check_icmp -w 10000ms,100% -c 10000ms,100%"
+        );
+is( $res->return_code, 3, "No hostname" );
+like( $res->output, '/No hosts to check/', "Output with appropriate error message");
+
diff --git a/plugins/t/check_ping.t b/plugins/t/check_ping.t
index 0dba91b4..b8323a0e 100644
--- a/plugins/t/check_ping.t
+++ b/plugins/t/check_ping.t
@@ -6,32 +6,79 @@
 #
 
 use strict;
-use Test;
+use Test::More;
 use NPTest;
 
-use vars qw($tests);
-
-BEGIN {$tests = 8; plan tests => $tests}
+plan tests => 18;
 
 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/';
 
-my $host_responsive    = getTestParameter( "host_responsive",   "NP_HOST_RESPONSIVE",     "localhost",
-                                           "The hostname of system responsive to network requests" );
+my $host_responsive    = getTestParameter( "NP_HOST_RESPONSIVE",
+                                "The hostname of system responsive to network requests",
+                                "localhost" );
+
+my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE",
+                                "The hostname of system not responsive to network requests",
+                                "10.0.0.1" );
+
+my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
+                                "An invalid (not known to DNS) hostname",
+                                "nosuchhost" );
+
+my $res;
+
+$res = NPTest->testCmd(
+        "./check_ping -H $host_responsive -w 10,100% -c 10,100% -p 1"
+        );
+is( $res->return_code, 0, "Syntax ok" );
+like( $res->output, $successOutput, "Output OK" );
+
+$res = NPTest->testCmd(
+        "./check_ping -H $host_responsive -w 0,0% -c 10,100% -p 1"
+        );
+is( $res->return_code, 1, "Syntax ok, with forced warning" );
+like( $res->output, $failureOutput, "Output OK" );
+
+$res = NPTest->testCmd(
+        "./check_ping -H $host_responsive -w 0,0% -c 0,0% -p 1"
+        );
+is( $res->return_code, 2, "Syntax ok, with forced critical" );
+like( $res->output, $failureOutput, "Output OK" );
+
+$res = NPTest->testCmd(
+        "./check_ping $host_responsive 100 100 1000 1000 -p 1"
+        );
+is( $res->return_code, 0, "Old syntax ok" );
+like( $res->output, $successOutput, "Output OK" );
+
+$res = NPTest->testCmd(
+        "./check_ping $host_responsive 0 0 0 0 -p 1"
+        );
+is( $res->return_code, 2, "Old syntax, with forced critical" );
+like( $res->output, $failureOutput, "Output OK" );
 
-my $host_nonresponsive = getTestParameter( "host_nonresponsive", "NP_HOST_NONRESPONSIVE", "10.0.0.1",
-                                           "The hostname of system not responsive to network requests" );
+$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" );
+like( $res->output, '/100%/', "Error contains '100%' string (for 100% packet loss)" );
 
-my $hostname_invalid   = getTestParameter( "hostname_invalid",   "NP_HOSTNAME_INVALID",   "nosuchhost",
-                                           "An invalid (not known to DNS) hostname" );
+$res = NPTest->testCmd(
+        "./check_ping $host_nonresponsive -p 1 -t 1 100 100 1000 10000"
+        );
+is( $res->return_code, 2, "Old syntax: Timeout - host nonresponsive" );
+like( $res->output, '/100%/', "Error contains '100%' string (for 100% packet loss)" );
 
-my $t;
+$res = NPTest->testCmd(
+        "./check_ping $hostname_invalid 0 0 0 0 -p 1 -t 1"
+        );
+is( $res->return_code, 3, "Invalid hostname" );
+like( $res->output, '/invalid hostname/i', "Error contains 'invalid hostname' string");
 
-$t += checkCmd( "./check_ping $host_responsive    100 100 1000 1000 -p 1",       0, $successOutput );
-$t += checkCmd( "./check_ping $host_responsive      0   0    0    0 -p 1",       2, $failureOutput );
-$t += checkCmd( "./check_ping $host_nonresponsive   0   0    0    0 -p 1 -to 1", 2 );
-$t += checkCmd( "./check_ping $hostname_invalid     0   0    0    0 -p 1 -to 1", 3 );
-$t += checkCmd( "./check_ping -w 100,10% -c 200,20%"                           , 3 , "/You must specify a server address or host name.*/");
+$res = NPTest->testCmd(
+        "./check_ping -w 100,10% -c 200,20%"
+        );
+is( $res->return_code, 3, "No hostname" );
+like( $res->output, '/You must specify a server address or host name/', "Output with appropriate error message");
 
-exit(0) if defined($Test::Harness::VERSION);
-exit($tests - $t);