From ea756ac4ad511cab67b0347cd318945bea86a8b9 Mon Sep 17 00:00:00 2001 From: Nicolai Date: Fri, 23 Dec 2016 20:44:45 +0100 Subject: check_dns: Tests and info --- plugins/t/check_dns.t | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'plugins/t') diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t index 035e7682..3dbb7186 100644 --- a/plugins/t/check_dns.t +++ b/plugins/t/check_dns.t @@ -10,7 +10,7 @@ use NPTest; plan skip_all => "check_dns not compiled" unless (-x "check_dns"); -plan tests => 16; +plan tests => 19; my $successOutput = '/DNS OK: [\.0-9]+ seconds? response time/'; @@ -23,7 +23,19 @@ my $hostname_valid = getTestParameter( my $hostname_valid_ip = getTestParameter( "NP_HOSTNAME_VALID_IP", "The IP address of the valid hostname $hostname_valid", - "66.118.156.50", + "130.133.8.40", + ); + +my $hostname_valid_cidr = getTestParameter( + "NP_HOSTNAME_VALID_CIDR", + "An valid CIDR range containing $hostname_valid_ip", + "130.133.8.41/30", + ); + +my $hostname_invalid_cidr = getTestParameter( + "NP_HOSTNAME_INVALID_CIDR", + "An valid CIDR range not containing $hostname_valid_ip", + "130.133.8.39/30", ); my $hostname_valid_reverse = getTestParameter( @@ -87,3 +99,9 @@ $res = NPTest->testCmd("./check_dns -H $hostname_valid_ip -a $hostname_valid_rev cmp_ok( $res->return_code, '==', 0, "Got expected fqdn"); like ( $res->output, $successOutput, "Output OK"); +$res = NPTest->testCmd("./check_dns -H $hostname_valid -a $hostname_valid_cidr -t 5"); +cmp_ok( $res->return_code, '==', 0, "Got expected address"); + +$res = NPTest->testCmd("./check_dns -H $hostname_valid -a $hostname_invalid_cidr -t 5"); +cmp_ok( $res->return_code, '==', 2, "Got wrong address"); +like ( $res->output, "/^DNS CRITICAL.*expected '$hostname_invalid_cidr' but got '$hostname_valid_ip'".'$/', "Output OK"); -- cgit v1.2.3 From b9f00386a17290d7c6d900bcb4c25a13e8d1b368 Mon Sep 17 00:00:00 2001 From: Nicolai Date: Fri, 23 Dec 2016 21:04:36 +0100 Subject: check_dns: Fix travis tests (or try to fix it...) --- plugins/t/NPTest.cache.travis | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugins/t') diff --git a/plugins/t/NPTest.cache.travis b/plugins/t/NPTest.cache.travis index bcec9855..8f72a55d 100644 --- a/plugins/t/NPTest.cache.travis +++ b/plugins/t/NPTest.cache.travis @@ -6,6 +6,8 @@ 'NP_HOSTNAME_INVALID' => 'nosuchhost', 'NP_HOSTNAME_VALID' => 'monitoringplugins.org', 'NP_HOSTNAME_VALID_IP' => '130.133.8.40', + 'NP_HOSTNAME_VALID_CIDR' => '130.133.8.41/30', + 'NP_HOSTNAME_INVALID_CIDR' => '130.133.8.39/30', 'NP_HOSTNAME_VALID_REVERSE' => 'orwell.monitoring-plugins.org.', 'NP_HOST_DHCP_RESPONSIVE' => '', 'NP_HOST_NONRESPONSIVE' => '10.0.0.1', -- cgit v1.2.3 From 6a0f4fe275bdf1c90de3d1b611293cf57cc3887b Mon Sep 17 00:00:00 2001 From: Nicolai Date: Fri, 23 Dec 2016 22:59:42 +0100 Subject: check_dns: Small test cleanup --- plugins/t/NPTest.cache.travis | 2 +- plugins/t/check_dns.t | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/t') diff --git a/plugins/t/NPTest.cache.travis b/plugins/t/NPTest.cache.travis index 8f72a55d..38c0a6b2 100644 --- a/plugins/t/NPTest.cache.travis +++ b/plugins/t/NPTest.cache.travis @@ -4,7 +4,7 @@ 'NP_DNS_SERVER' => '8.8.8.8', 'NP_GOOD_NTP_SERVICE' => '', 'NP_HOSTNAME_INVALID' => 'nosuchhost', - 'NP_HOSTNAME_VALID' => 'monitoringplugins.org', + 'NP_HOSTNAME_VALID' => 'monitoring-plugins.org', 'NP_HOSTNAME_VALID_IP' => '130.133.8.40', 'NP_HOSTNAME_VALID_CIDR' => '130.133.8.41/30', 'NP_HOSTNAME_INVALID_CIDR' => '130.133.8.39/30', diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t index 3dbb7186..cdfbe60d 100644 --- a/plugins/t/check_dns.t +++ b/plugins/t/check_dns.t @@ -17,7 +17,7 @@ my $successOutput = '/DNS OK: [\.0-9]+ seconds? response time/'; my $hostname_valid = getTestParameter( "NP_HOSTNAME_VALID", "A valid (known to DNS) hostname", - "monitoring-plugins.org" + "monitoring-plugins.org", ); my $hostname_valid_ip = getTestParameter( @@ -34,14 +34,14 @@ my $hostname_valid_cidr = getTestParameter( my $hostname_invalid_cidr = getTestParameter( "NP_HOSTNAME_INVALID_CIDR", - "An valid CIDR range not containing $hostname_valid_ip", + "An (valid) CIDR range NOT containing $hostname_valid_ip", "130.133.8.39/30", ); my $hostname_valid_reverse = getTestParameter( "NP_HOSTNAME_VALID_REVERSE", "The hostname of $hostname_valid_ip", - "66-118-156-50.static.sagonet.net.", + "orwell.monitoring-plugins.org.", ); my $hostname_invalid = getTestParameter( -- cgit v1.2.3