[Nagiosplug-checkins] SF.net SVN: nagiosplug: [1826] nagiosplug/branches/dermoth_ntp_rework/ plugins/t

dermoth at users.sourceforge.net dermoth at users.sourceforge.net
Sat Nov 10 23:55:46 CET 2007


Revision: 1826
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=1826&view=rev
Author:   dermoth
Date:     2007-11-10 14:55:46 -0800 (Sat, 10 Nov 2007)

Log Message:
-----------
New tests!! + single file to test all three plugins (Can be split again if ppl prefer that).

Modified Paths:
--------------
    nagiosplug/branches/dermoth_ntp_rework/plugins/t/check_ntp.t

Removed Paths:
-------------
    nagiosplug/branches/dermoth_ntp_rework/plugins/t/check_ntpd.t
    nagiosplug/branches/dermoth_ntp_rework/plugins/t/check_time_ntp.t

Modified: nagiosplug/branches/dermoth_ntp_rework/plugins/t/check_ntp.t
===================================================================
--- nagiosplug/branches/dermoth_ntp_rework/plugins/t/check_ntp.t	2007-11-10 22:13:43 UTC (rev 1825)
+++ nagiosplug/branches/dermoth_ntp_rework/plugins/t/check_ntp.t	2007-11-10 22:55:46 UTC (rev 1826)
@@ -9,8 +9,11 @@
 use Test::More;
 use NPTest;
 
-plan tests => 4;
+my @PLUGINS1 = ('check_ntp', 'check_ntpd', 'check_time_ntp');
+my @PLUGINS2 = ('check_ntp', 'check_ntpd');
 
+plan tests => (9 * scalar(@PLUGINS1)) + (6 * scalar(@PLUGINS2));
+
 my $res;
 
 my $ntp_service = getTestParameter( "NP_GOOD_NTP_SERVICE",
@@ -25,33 +28,78 @@
 		"The hostname of system not responsive to network requests",
 		"10.0.0.1" );
 
-my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID", 
+my $hostname_invalid = getTestParameter( "NP_HOSTNAME_INVALID", 
 		"An invalid (not known to DNS) hostname",  
 		"nosuchhost");
 
-SKIP: {
-	skip "No NTP server defined", 1 unless $ntp_service;
+my $ntp_okmatch1 = '/^NTP\sOK:\sOffset\s-?[0-9]+(\.[0-9]+)?(e-[0-9]{2})?\ssecs/';
+my $ntp_warnmatch1 = '/^NTP\sWARNING:\sOffset\s-?[0-9]+(\.[0-9]+)?(e-[0-9]{2})?\ssecs/';
+my $ntp_critmatch1 = '/^NTP\sCRITICAL:\sOffset\s-?[0-9]+(\.[0-9]+)?(e-[0-9]{2})?\ssecs/';
+my $ntp_okmatch2 = '/^NTP\sOK:\sOffset\s-?[0-9]+(\.[0-9]+)?(e-[0-9]{2})?\ssecs,\sjitter=[0-9]+\.[0-9]+,\sstratum=[0-9]{1,2}/';
+my $ntp_warnmatch2 = '/^NTP\sWARNING:\sOffset\s-?[0-9]+(\.[0-9]+)?(e-[0-9]{2})?\ssecs,\sjitter=[0-9]+\.[0-9]+,\sstratum=[0-9]{1,2}/';
+my $ntp_critmatch2 = '/^NTP\sCRITICAL:\sOffset\s-?[0-9]+(\.[0-9]+)?(e-[0-9]{2})?\ssecs,\sjitter=[0-9]+\.[0-9]+,\sstratum=[0-9]{1,2}/';
+
+foreach my $plugin (@PLUGINS1) {
+	SKIP: {
+		skip "No NTP server defined", 1 unless $ntp_service;
+		$res = NPTest->testCmd(
+			"./$plugin -H $ntp_service -w 1000 -c 2000"
+			);
+		cmp_ok( $res->return_code, '==', 0, "Got good NTP result");
+		like( $res->output, $ntp_okmatch1, "Output OK" );
+
+		$res = NPTest->testCmd(
+			"./$plugin -H $ntp_service -w 1000: -c 2000"
+			);
+		cmp_ok( $res->return_code, '==', 1, "Got warning NTP result");
+		like( $res->output, $ntp_warnmatch1, "Output WARNING" );
+
+		$res = NPTest->testCmd(
+			"./$plugin -H $ntp_service -w 1000 -c 2000:"
+			);
+		cmp_ok( $res->return_code, '==', 2, "Got critical NTP result");
+		like( $res->output, $ntp_critmatch1, "Output CRITICAL" );
+	}
+
+	SKIP: {
+		skip "No bad NTP server defined", 1 unless $no_ntp_service;
+		$res = NPTest->testCmd(
+			"./$plugin -H $no_ntp_service"
+			);
+		cmp_ok( $res->return_code, '==', 2, "Got bad NTP result");
+	}
+
 	$res = NPTest->testCmd(
-		"./check_ntp -H $ntp_service"
+		"./$plugin -H $host_nonresponsive"
 		);
-	cmp_ok( $res->return_code, '==', 0, "Got good NTP result");
-}
+	cmp_ok( $res->return_code, '==', 2, "Got critical if server not responding");
 
-SKIP: {
-	skip "No bad NTP server defined", 1 unless $no_ntp_service;
 	$res = NPTest->testCmd(
-		"./check_ntp -H $no_ntp_service"
+		"./$plugin -H $hostname_invalid"
 		);
-	cmp_ok( $res->return_code, '==', 2, "Got bad NTP result");
+	cmp_ok( $res->return_code, '==', 3, "Got critical if server hostname invalid");
+
 }
 
-$res = NPTest->testCmd(
-	"./check_ntp -H $host_nonresponsive"
-	);
-cmp_ok( $res->return_code, '==', 2, "Got critical if server not responding");
+foreach my $plugin (@PLUGINS2) {
+	SKIP: {
+		skip "No NTP server defined", 1 unless $ntp_service;
+		$res = NPTest->testCmd(
+			"./$plugin -H $ntp_service -w 1000 -c 2000 -W 20 -C 21 -j 100000 -k 200000"
+			);
+		cmp_ok( $res->return_code, '==', 0, "Got good NTP result");
+		like( $res->output, $ntp_okmatch2, "Output OK" );
 
-$res = NPTest->testCmd(
-	"./check_ntp -H $hostname_invalid"
-	);
-cmp_ok( $res->return_code, '==', 3, "Got critical if server hostname invalid");
+		$res = NPTest->testCmd(
+			"./$plugin -H $ntp_service -w 1000 -c 2000 -W ~:-1 -C 21 -j 100000 -k 200000"
+			);
+		cmp_ok( $res->return_code, '==', 1, "Got warning NTP result");
+		like( $res->output, $ntp_warnmatch2, "Output WARNING" );
 
+		$res = NPTest->testCmd(
+			"./$plugin -H $ntp_service -w 1000 -c 2000 -W 20 -C 21 -j 100000 -k ~:-1"
+			);
+		cmp_ok( $res->return_code, '==', 2, "Got critical NTP result");
+		like( $res->output, $ntp_critmatch2, "Output CRITICAL" );
+	}
+}

Deleted: nagiosplug/branches/dermoth_ntp_rework/plugins/t/check_ntpd.t
===================================================================
--- nagiosplug/branches/dermoth_ntp_rework/plugins/t/check_ntpd.t	2007-11-10 22:13:43 UTC (rev 1825)
+++ nagiosplug/branches/dermoth_ntp_rework/plugins/t/check_ntpd.t	2007-11-10 22:55:46 UTC (rev 1826)
@@ -1,57 +0,0 @@
-#! /usr/bin/perl -w -I ..
-#
-# Testing NTP
-#
-# $Id: check_ntp.t 1468 2006-08-14 08:42:23Z tonvoon $
-#
-
-use strict;
-use Test::More;
-use NPTest;
-
-plan tests => 4;
-
-my $res;
-
-my $ntp_service = getTestParameter( "NP_GOOD_NTP_SERVICE",
-		"A host providing NTP service",
-		"pool.ntp.org");
-
-my $no_ntp_service = getTestParameter( "NP_NO_NTP_SERVICE",
-		"A host NOT providing the NTP service",
-		"localhost" );
-
-my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE", 
-		"The hostname of system not responsive to network requests",
-		"10.0.0.1" );
-
-my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID", 
-		"An invalid (not known to DNS) hostname",  
-		"nosuchhost");
-
-SKIP: {
-	skip "No NTP server defined", 1 unless $ntp_service;
-	$res = NPTest->testCmd(
-		"./check_ntp -H $ntp_service"
-		);
-	cmp_ok( $res->return_code, '==', 0, "Got good NTP result");
-}
-
-SKIP: {
-	skip "No bad NTP server defined", 1 unless $no_ntp_service;
-	$res = NPTest->testCmd(
-		"./check_ntp -H $no_ntp_service"
-		);
-	cmp_ok( $res->return_code, '==', 2, "Got bad NTP result");
-}
-
-$res = NPTest->testCmd(
-	"./check_ntp -H $host_nonresponsive"
-	);
-cmp_ok( $res->return_code, '==', 2, "Got critical if server not responding");
-
-$res = NPTest->testCmd(
-	"./check_ntp -H $hostname_invalid"
-	);
-cmp_ok( $res->return_code, '==', 3, "Got critical if server hostname invalid");
-

Deleted: nagiosplug/branches/dermoth_ntp_rework/plugins/t/check_time_ntp.t
===================================================================
--- nagiosplug/branches/dermoth_ntp_rework/plugins/t/check_time_ntp.t	2007-11-10 22:13:43 UTC (rev 1825)
+++ nagiosplug/branches/dermoth_ntp_rework/plugins/t/check_time_ntp.t	2007-11-10 22:55:46 UTC (rev 1826)
@@ -1,57 +0,0 @@
-#! /usr/bin/perl -w -I ..
-#
-# Testing NTP
-#
-# $Id: check_ntp.t 1468 2006-08-14 08:42:23Z tonvoon $
-#
-
-use strict;
-use Test::More;
-use NPTest;
-
-plan tests => 4;
-
-my $res;
-
-my $ntp_service = getTestParameter( "NP_GOOD_NTP_SERVICE",
-		"A host providing NTP service",
-		"pool.ntp.org");
-
-my $no_ntp_service = getTestParameter( "NP_NO_NTP_SERVICE",
-		"A host NOT providing the NTP service",
-		"localhost" );
-
-my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE", 
-		"The hostname of system not responsive to network requests",
-		"10.0.0.1" );
-
-my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID", 
-		"An invalid (not known to DNS) hostname",  
-		"nosuchhost");
-
-SKIP: {
-	skip "No NTP server defined", 1 unless $ntp_service;
-	$res = NPTest->testCmd(
-		"./check_ntp -H $ntp_service"
-		);
-	cmp_ok( $res->return_code, '==', 0, "Got good NTP result");
-}
-
-SKIP: {
-	skip "No bad NTP server defined", 1 unless $no_ntp_service;
-	$res = NPTest->testCmd(
-		"./check_ntp -H $no_ntp_service"
-		);
-	cmp_ok( $res->return_code, '==', 2, "Got bad NTP result");
-}
-
-$res = NPTest->testCmd(
-	"./check_ntp -H $host_nonresponsive"
-	);
-cmp_ok( $res->return_code, '==', 2, "Got critical if server not responding");
-
-$res = NPTest->testCmd(
-	"./check_ntp -H $hostname_invalid"
-	);
-cmp_ok( $res->return_code, '==', 3, "Got critical if server hostname invalid");
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Commits mailing list