[Nagiosplug-checkins] nagiosplug/plugins/t check_disk.t,1.20,1.21

Matthias Eble psychotrahe at users.sourceforge.net
Wed May 9 10:16:46 CEST 2007


Update of /cvsroot/nagiosplug/nagiosplug/plugins/t
In directory sc8-pr-cvs16:/tmp/cvs-serv26894/plugins/t

Modified Files:
	check_disk.t 
Log Message:
added testcase to verify that old positional arguments only select one path


Index: check_disk.t
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/t/check_disk.t,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_disk.t	30 Mar 2007 09:00:06 -0000	1.20
+++ check_disk.t	9 May 2007 08:16:44 -0000	1.21
@@ -24,7 +24,7 @@
 if ($mountpoint_valid eq "" or $mountpoint2_valid eq "") {
 	plan skip_all => "Need 2 mountpoints to test";
 } else {
-	plan tests => 68;
+	plan tests => 69;
 }
 
 $result = NPTest->testCmd( 
@@ -114,10 +114,8 @@
 $result = NPTest->testCmd( "./check_disk -w 1 -c 1 -p $more_free -p $less_free" );
 cmp_ok( $result->return_code, '==', 0, "At least 1 MB available on $more_free and $less_free");
 $_ = $result->output;
-print $result->output."\n";
 my ($free_mb_on_mp1, $free_mb_on_mp2) = (m/(\d+) MB .* (\d+) MB /g);
 my $free_mb_on_all = $free_mb_on_mp1 + $free_mb_on_mp2;
-print "$free_mb_on_all = $free_mb_on_mp1 + $free_mb_on_mp2\n";
 
 
 
@@ -255,6 +253,7 @@
 # Checking old syntax of check_disk warn crit [fs], with warn/crit at USED% thresholds
 $result = NPTest->testCmd( "./check_disk 0 0 ".${mountpoint_valid} );
 cmp_ok( $result->return_code, "==", 2, "Old syntax: 0% used");
+like ( $result->only_output, qr(^[^;]*;[^;]*$), "Select only one path with positional arguments");
 
 $result = NPTest->testCmd( "./check_disk 100 100 $mountpoint_valid" );
 cmp_ok( $result->return_code, '==', 0, "Old syntax: 100% used" );





More information about the Commits mailing list