From: Ton Voon <tonvoon@users.sourceforge.net>
Date: Thu, 3 Nov 2005 15:13:13 +0000 (+0000)
Subject: Invalid mount point doesn't make sense because most df implementations
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=595b2571a417fd2216071e80979fbe20e5cf1d4f;p=nagiosplug.git

Invalid mount point doesn't make sense because most df implementations
would work out the actual mount point. And fixed typo in check_procs.t


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1271 f882894a-f735-0410-b71e-b25c423dba1c
---

diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t
index f2427fb..df6e149 100644
--- a/plugins/t/check_disk.t
+++ b/plugins/t/check_disk.t
@@ -10,7 +10,7 @@ use Test;
 use NPTest;
 
 use vars qw($tests);
-BEGIN {$tests = 10; plan tests => $tests}
+BEGIN {$tests = 8; plan tests => $tests}
 
 my $successOutput = '/^DISK OK - /';
 my $failureOutput = '/^DISK CRITICAL - /';
@@ -18,16 +18,12 @@ my $failureOutput = '/^DISK CRITICAL - /';
 my $mountpoint_valid   = getTestParameter( "mountpoint_valid",   "NP_MOUNTPOINT_VALID",   "/",
 					   "The path to a valid mountpoint" );
 
-my $mountpoint_invalid = getTestParameter( "mountpoint_invalid", "NP_MOUNTPOINT_INVALID", "/missing",
-					   "The path to a invalid (non-existent) mountpoint" );
-
 my $t;
 
 $t += checkCmd( "./check_disk 100 100       ${mountpoint_valid}",   0, $successOutput );
 $t += checkCmd( "./check_disk -w 0 -c 0     ${mountpoint_valid}",   0, $successOutput );
 $t += checkCmd( "./check_disk -w 1\% -c 1\% ${mountpoint_valid}",   0, $successOutput );
 $t += checkCmd( "./check_disk 0 0           ${mountpoint_valid}",   2, $failureOutput );
-$t += checkCmd( "./check_disk 100 100       ${mountpoint_invalid}", 2, '/not found/'  );
 
 exit(0) if defined($Test::Harness::VERSION);
 exit($tests - $t);
diff --git a/plugins/t/check_procs.t b/plugins/t/check_procs.t
index 91f5c44..b8c2e8a 100644
--- a/plugins/t/check_procs.t
+++ b/plugins/t/check_procs.t
@@ -19,7 +19,7 @@ $t += checkCmd( "./check_procs -w 100000 -c   100000 -s Z", 0, '/^PROCS OK: [0-9
 $t += checkCmd( "./check_procs -w      0 -c 10000000",      1, '/^PROCS WARNING: [0-9]+ process(es)?$/' );
 $t += checkCmd( "./check_procs -w 0      -c        0",      2, '/^PROCS CRITICAL: [0-9]+ process(es)?$/' );
 $t += checkCmd( "./check_procs -w 0      -c        0 -s S", 2, '/^PROCS CRITICAL: [0-9]+ process(es)? with /' );
-$t += checkCmd( "./check_procs -w 0      -c 10000000 -p 1", 1, "/^PROCS WARNING: [0-9]+ process(es)? with PPID = 1/' );
+$t += checkCmd( "./check_procs -w 0      -c 10000000 -p 1", 1, '/^PROCS WARNING: [0-9]+ process(es)? with PPID = 1/' );
 
 exit(0) if defined($Test::Harness::VERSION);
 exit($tests - $t);