[nagiosplug] check_icmp: tests do not require sudo if run by ...

[Nagios Plugin Development]

    Module: nagiosplug
    Branch: master
    Commit: 3c958ac73844d877fb2f22c397a9fd4aa6c5c99c
    Author: Sven Nierlein <Sven.Nierlein at consol.de>
 Committer: Sven Nierlein <sven at consol.de>
      Date: Sun Sep 15 21:57:27 2013 +0200
       URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=3c958ac

check_icmp: tests do not require sudo if run by root

---

 plugins-root/t/check_icmp.t |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/plugins-root/t/check_icmp.t b/plugins-root/t/check_icmp.t
index 78bfd63..e043d4e 100644
--- a/plugins-root/t/check_icmp.t
+++ b/plugins-root/t/check_icmp.t
@@ -11,11 +11,12 @@ 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") {
+if ($allow_sudo eq "yes" or $> == 0) {
 	plan tests => 16;
 } else {
 	plan skip_all => "Need sudo to test check_icmp";
 }
+my $sudo = $> == 0 ? '' : 'sudo';
 
 my $successOutput = '/OK - .*?: rta (?:[\d\.]+ms)|(?:nan), lost \d+%/';
 my $failureOutput = '/(WARNING|CRITICAL) - .*?: rta [\d\.]+ms, lost \d%/';
@@ -35,49 +36,49 @@ my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
 my $res;
 
 $res = NPTest->testCmd(
-	"sudo ./check_icmp -H $host_responsive -w 10000ms,100% -c 10000ms,100%"
+	"$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%"
+	"$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%"
+	"$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%"
+	"$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%"
+	"$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");
 
 $res = NPTest->testCmd(
-	"sudo ./check_icmp -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 0"
+	"$sudo ./check_icmp -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 0"
 	);
 is( $res->return_code, 0, "One host nonresponsive - zero required" );
 like( $res->output, $successOutput, "Output OK" );
 
 $res = NPTest->testCmd(
-	"sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 1"
+	"$sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 1"
 	);
 is( $res->return_code, 0, "One of two host nonresponsive - one required" );
 like( $res->output, $successOutput, "Output OK" );
 
 $res = NPTest->testCmd(
-	"sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 2"
+	"$sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 2"
 	);
 is( $res->return_code, 2, "One of two host nonresponsive - two required" );
 like( $res->output, $failureOutput, "Output OK" );