diff options
author | Jan Wagner <waja@cyconet.org> | 2017-01-04 13:29:00 +0100 |
---|---|---|
committer | Jan Wagner <waja@cyconet.org> | 2017-01-04 13:29:00 +0100 |
commit | d9a1fb15dd60935cf1655e6b9786b28e899c8dc8 (patch) | |
tree | 31a2708d65e6b03301f35a3ec5df3abe6d8b93a7 /plugins/t | |
parent | f524b15e572c4316feb70917d05f6349bef996ef (diff) | |
parent | 6a0f4fe275bdf1c90de3d1b611293cf57cc3887b (diff) | |
download | monitoring-plugins-d9a1fb15dd60935cf1655e6b9786b28e899c8dc8.tar.gz |
Merge remote-tracking branch 'upstream/pr/1456'
Diffstat (limited to 'plugins/t')
-rw-r--r-- | plugins/t/NPTest.cache.travis | 4 | ||||
-rw-r--r-- | plugins/t/check_dns.t | 26 |
2 files changed, 25 insertions, 5 deletions
diff --git a/plugins/t/NPTest.cache.travis b/plugins/t/NPTest.cache.travis index bcec9855..38c0a6b2 100644 --- a/plugins/t/NPTest.cache.travis +++ b/plugins/t/NPTest.cache.travis | |||
@@ -4,8 +4,10 @@ | |||
4 | 'NP_DNS_SERVER' => '8.8.8.8', | 4 | 'NP_DNS_SERVER' => '8.8.8.8', |
5 | 'NP_GOOD_NTP_SERVICE' => '', | 5 | 'NP_GOOD_NTP_SERVICE' => '', |
6 | 'NP_HOSTNAME_INVALID' => 'nosuchhost', | 6 | 'NP_HOSTNAME_INVALID' => 'nosuchhost', |
7 | 'NP_HOSTNAME_VALID' => 'monitoringplugins.org', | 7 | 'NP_HOSTNAME_VALID' => 'monitoring-plugins.org', |
8 | 'NP_HOSTNAME_VALID_IP' => '130.133.8.40', | 8 | 'NP_HOSTNAME_VALID_IP' => '130.133.8.40', |
9 | 'NP_HOSTNAME_VALID_CIDR' => '130.133.8.41/30', | ||
10 | 'NP_HOSTNAME_INVALID_CIDR' => '130.133.8.39/30', | ||
9 | 'NP_HOSTNAME_VALID_REVERSE' => 'orwell.monitoring-plugins.org.', | 11 | 'NP_HOSTNAME_VALID_REVERSE' => 'orwell.monitoring-plugins.org.', |
10 | 'NP_HOST_DHCP_RESPONSIVE' => '', | 12 | 'NP_HOST_DHCP_RESPONSIVE' => '', |
11 | 'NP_HOST_NONRESPONSIVE' => '10.0.0.1', | 13 | 'NP_HOST_NONRESPONSIVE' => '10.0.0.1', |
diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t index 035e7682..cdfbe60d 100644 --- a/plugins/t/check_dns.t +++ b/plugins/t/check_dns.t | |||
@@ -10,26 +10,38 @@ use NPTest; | |||
10 | 10 | ||
11 | plan skip_all => "check_dns not compiled" unless (-x "check_dns"); | 11 | plan skip_all => "check_dns not compiled" unless (-x "check_dns"); |
12 | 12 | ||
13 | plan tests => 16; | 13 | plan tests => 19; |
14 | 14 | ||
15 | my $successOutput = '/DNS OK: [\.0-9]+ seconds? response time/'; | 15 | my $successOutput = '/DNS OK: [\.0-9]+ seconds? response time/'; |
16 | 16 | ||
17 | my $hostname_valid = getTestParameter( | 17 | my $hostname_valid = getTestParameter( |
18 | "NP_HOSTNAME_VALID", | 18 | "NP_HOSTNAME_VALID", |
19 | "A valid (known to DNS) hostname", | 19 | "A valid (known to DNS) hostname", |
20 | "monitoring-plugins.org" | 20 | "monitoring-plugins.org", |
21 | ); | 21 | ); |
22 | 22 | ||
23 | my $hostname_valid_ip = getTestParameter( | 23 | my $hostname_valid_ip = getTestParameter( |
24 | "NP_HOSTNAME_VALID_IP", | 24 | "NP_HOSTNAME_VALID_IP", |
25 | "The IP address of the valid hostname $hostname_valid", | 25 | "The IP address of the valid hostname $hostname_valid", |
26 | "66.118.156.50", | 26 | "130.133.8.40", |
27 | ); | ||
28 | |||
29 | my $hostname_valid_cidr = getTestParameter( | ||
30 | "NP_HOSTNAME_VALID_CIDR", | ||
31 | "An valid CIDR range containing $hostname_valid_ip", | ||
32 | "130.133.8.41/30", | ||
33 | ); | ||
34 | |||
35 | my $hostname_invalid_cidr = getTestParameter( | ||
36 | "NP_HOSTNAME_INVALID_CIDR", | ||
37 | "An (valid) CIDR range NOT containing $hostname_valid_ip", | ||
38 | "130.133.8.39/30", | ||
27 | ); | 39 | ); |
28 | 40 | ||
29 | my $hostname_valid_reverse = getTestParameter( | 41 | my $hostname_valid_reverse = getTestParameter( |
30 | "NP_HOSTNAME_VALID_REVERSE", | 42 | "NP_HOSTNAME_VALID_REVERSE", |
31 | "The hostname of $hostname_valid_ip", | 43 | "The hostname of $hostname_valid_ip", |
32 | "66-118-156-50.static.sagonet.net.", | 44 | "orwell.monitoring-plugins.org.", |
33 | ); | 45 | ); |
34 | 46 | ||
35 | my $hostname_invalid = getTestParameter( | 47 | my $hostname_invalid = getTestParameter( |
@@ -87,3 +99,9 @@ $res = NPTest->testCmd("./check_dns -H $hostname_valid_ip -a $hostname_valid_rev | |||
87 | cmp_ok( $res->return_code, '==', 0, "Got expected fqdn"); | 99 | cmp_ok( $res->return_code, '==', 0, "Got expected fqdn"); |
88 | like ( $res->output, $successOutput, "Output OK"); | 100 | like ( $res->output, $successOutput, "Output OK"); |
89 | 101 | ||
102 | $res = NPTest->testCmd("./check_dns -H $hostname_valid -a $hostname_valid_cidr -t 5"); | ||
103 | cmp_ok( $res->return_code, '==', 0, "Got expected address"); | ||
104 | |||
105 | $res = NPTest->testCmd("./check_dns -H $hostname_valid -a $hostname_invalid_cidr -t 5"); | ||
106 | cmp_ok( $res->return_code, '==', 2, "Got wrong address"); | ||
107 | like ( $res->output, "/^DNS CRITICAL.*expected '$hostname_invalid_cidr' but got '$hostname_valid_ip'".'$/', "Output OK"); | ||