[Nagiosplug-checkins] nagiosplug/plugins/t check_disk.t,1.2,1.3 check_procs.t,1.4,1.5

Ton Voon tonvoon at users.sourceforge.net
Thu Nov 3 07:13:49 CET 2005


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

Modified Files:
	check_disk.t check_procs.t 
Log Message:
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


Index: check_procs.t
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/t/check_procs.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- check_procs.t	20 Sep 2005 11:34:34 -0000	1.4
+++ check_procs.t	3 Nov 2005 15:13:13 -0000	1.5
@@ -19,7 +19,7 @@
 $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);

Index: check_disk.t
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/t/check_disk.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- check_disk.t	25 Jul 2005 01:47:14 -0000	1.2
+++ check_disk.t	3 Nov 2005 15:13:13 -0000	1.3
@@ -10,7 +10,7 @@
 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 $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);





More information about the Commits mailing list