[Nagiosplug-checkins] nagiosplug NPTest.pm,1.2,1.3

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17484

Modified Files:
	NPTest.pm 
Log Message:
Fixing some test failures


Index: NPTest.pm
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/NPTest.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NPTest.pm	25 Jul 2005 14:17:48 -0000	1.2
+++ NPTest.pm	3 Nov 2005 15:04:16 -0000	1.3
@@ -88,7 +88,7 @@
 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 @@
     if ( %exceptions && exists( $exceptions{$exitStatus} ) )
     {
       $testStatus += skip( $exceptions{$exitStatus}, $exitStatus, $desiredExitStatus );
+      $testOutput = "skip";
     }
     else
     {
@@ -312,7 +313,7 @@
 
   if ( defined( $envvar ) &&  exists( $ENV{$envvar} ) && $ENV{$envvar} )
   {
-    return $ENV{$envvar}
+    return $ENV{$envvar};
   }
 
   my $cachedValue = SearchCache( $param, $testharness );