diff options
author | Ton Voon <tonvoon@users.sourceforge.net> | 2005-11-03 15:04:16 +0000 |
---|---|---|
committer | Ton Voon <tonvoon@users.sourceforge.net> | 2005-11-03 15:04:16 +0000 |
commit | f278c817e584ac7ccd3bdfee3daefdbc483398b7 (patch) | |
tree | a30a777628040bb25e2f42d86e15f47c12d0f3ee /NPTest.pm | |
parent | 5537f7b0cdac98df3b9a090e13030969e404ed7d (diff) | |
download | monitoring-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.pm | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -88,7 +88,7 @@ typical tests we wish to perform are against the exit status of the | |||
88 | command and the output (if any) it generated. Simplifying these tests | 88 | command and the output (if any) it generated. Simplifying these tests |
89 | into a single function call, makes the test harness easier to read and | 89 | into a single function call, makes the test harness easier to read and |
90 | maintain and allows additional functionality (such as debugging) to be | 90 | maintain and allows additional functionality (such as debugging) to be |
91 | provided withoutadditional effort on the part of the test harness | 91 | provided without additional effort on the part of the test harness |
92 | developer. | 92 | developer. |
93 | 93 | ||
94 | It is possible to enable debugging via the environment variable | 94 | It is possible to enable debugging via the environment variable |
@@ -264,6 +264,7 @@ sub checkCmd | |||
264 | if ( %exceptions && exists( $exceptions{$exitStatus} ) ) | 264 | if ( %exceptions && exists( $exceptions{$exitStatus} ) ) |
265 | { | 265 | { |
266 | $testStatus += skip( $exceptions{$exitStatus}, $exitStatus, $desiredExitStatus ); | 266 | $testStatus += skip( $exceptions{$exitStatus}, $exitStatus, $desiredExitStatus ); |
267 | $testOutput = "skip"; | ||
267 | } | 268 | } |
268 | else | 269 | else |
269 | { | 270 | { |
@@ -312,7 +313,7 @@ sub getTestParameter | |||
312 | 313 | ||
313 | if ( defined( $envvar ) && exists( $ENV{$envvar} ) && $ENV{$envvar} ) | 314 | if ( defined( $envvar ) && exists( $ENV{$envvar} ) && $ENV{$envvar} ) |
314 | { | 315 | { |
315 | return $ENV{$envvar} | 316 | return $ENV{$envvar}; |
316 | } | 317 | } |
317 | 318 | ||
318 | my $cachedValue = SearchCache( $param, $testharness ); | 319 | my $cachedValue = SearchCache( $param, $testharness ); |