aboutsummaryrefslogtreecommitdiff
path: root/NPTest.pm
diff options
context:
space:
mode:
authorGravatar Ton Voon <tonvoon@users.sourceforge.net> 2005-11-03 15:04:16 +0000
committerGravatar Ton Voon <tonvoon@users.sourceforge.net> 2005-11-03 15:04:16 +0000
commitf278c817e584ac7ccd3bdfee3daefdbc483398b7 (patch)
treea30a777628040bb25e2f42d86e15f47c12d0f3ee /NPTest.pm
parent5537f7b0cdac98df3b9a090e13030969e404ed7d (diff)
downloadmonitoring-plugins-f278c817e584ac7ccd3bdfee3daefdbc483398b7.tar.gz
Fixing some test failures
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1270 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'NPTest.pm')
-rw-r--r--NPTest.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/NPTest.pm b/NPTest.pm
index 201bc6ae..8f20678b 100644
--- a/NPTest.pm
+++ b/NPTest.pm
@@ -88,7 +88,7 @@ typical tests we wish to perform are against the exit status of the
command and the output (if any) it generated. Simplifying these tests
into a single function call, makes the test harness easier to read and
maintain and allows additional functionality (such as debugging) to be
-provided withoutadditional effort on the part of the test harness
+provided without additional effort on the part of the test harness
developer.
It is possible to enable debugging via the environment variable
@@ -264,6 +264,7 @@ sub checkCmd
if ( %exceptions && exists( $exceptions{$exitStatus} ) )
{
$testStatus += skip( $exceptions{$exitStatus}, $exitStatus, $desiredExitStatus );
+ $testOutput = "skip";
}
else
{
@@ -312,7 +313,7 @@ sub getTestParameter
if ( defined( $envvar ) && exists( $ENV{$envvar} ) && $ENV{$envvar} )
{
- return $ENV{$envvar}
+ return $ENV{$envvar};
}
my $cachedValue = SearchCache( $param, $testharness );