[Nagiosplug-checkins] nagiosplug/plugins/t check_disk.t,1.16,1.17

[Thomas Guyot]

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

Modified Files:
	check_disk.t 
Log Message:
Fix #1643463: Miscalculating thresholds check_disk


Index: check_disk.t
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/t/check_disk.t,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- check_disk.t	8 Jan 2007 11:05:55 -0000	1.16
+++ check_disk.t	27 Jan 2007 21:49:21 -0000	1.17
@@ -24,7 +24,7 @@
 if ($mountpoint_valid eq "" or $mountpoint2_valid eq "") {
 	plan skip_all => "Need 2 mountpoints to test";
 } else {
-	plan tests => 57;
+	plan tests => 61;
 }
 
 $result = NPTest->testCmd( 
@@ -76,6 +76,24 @@
 	die "Two mountpoints with same inodes free - cannot do rest of test";
 }
 
+# Verify performance data
+# First check absolute thresholds...
+$result = NPTest->testCmd(
+        "./check_disk -w 20 -c 10 -p $mountpoint_valid"
+        );
+$_ = $result->perf_output;
+my ($warn_absth_data, $crit_absth_data) = (m/=.[^;]*;(\d+);(\d+);\d+;\d+/);
+is ($warn_absth_data, 20, "Wrong warning in perf data using absolute thresholds");
+is ($crit_absth_data, 10, "Wrong critical in perf data using absolute thresholds");
+
+# Then check percent thresholds.
+$result = NPTest->testCmd(
+        "./check_disk -w 20% -c 10% -p $mountpoint_valid"
+        );
+$_ = $result->perf_output;
+my ($warn_percth_data, $crit_percth_data, $total_percth_data) = (m/=.[^;]*;(\d+);(\d+);\d+;(\d+)/);
+is ($warn_percth_data, int($total_percth_data/100*20), "Wrong warning in perf data using percent thresholds");
+is ($crit_percth_data, int($total_percth_data/100*10), "Wrong critical in perf data using percent thresholds");
 
 
 # Check when order of mount points are reversed, that perf data remains same