upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-04-21 14:19:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: move ipv6 detection into NPTest module

Browse source
This commit is contained in:
Sven Nierlein 2013-09-14 19:36:20 +02:00
parent 32ec6265a4
commit 7b122f13db
3 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
NPTest.pm
View file

@ -645,6 +645,16 @@ sub testCmd {
return $object;
}
# do we have ipv6
sub has_ipv6 {
# assume ipv6 if a ping6 to labs.consol.de works
`ping6 -c 1 2a03:3680:0:2::21 2>&1`;
if($? == 0) {
return 1;
}
return;
}
1;
#
# End of File

20
plugins/t/check_dig.t
View file

@ -6,11 +6,16 @@
use strict;
use Test::More;
use NPTest;
plan skip_all => "check_dig not compiled" unless (-x "check_dig");
plan tests => 16;
use vars qw($tests $has_ipv6);
BEGIN {
plan skip_all => "check_dig not compiled" unless (-x "check_dig");
use NPTest;
$has_ipv6 = NPTest::has_ipv6();
$tests = $has_ipv6 ? 16 : 14;
plan tests => $tests;
}
my $successOutput = '/DNS OK - [\.0-9]+ seconds? response time/';
@ -73,10 +78,6 @@ SKIP: {
cmp_ok( $res->return_code, '==', 0, "Found $hostname_valid on $dns_server");
like ( $res->output, $successOutput, "Output OK for IPv4" );
$res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid -t 5 -6");
cmp_ok( $res->return_code, '==', 0, "Found $hostname_valid on $dns_server");
like ( $res->output, $successOutput, "Output OK for IPv6" );
$res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid -a $hostname_valid_ip -t 5");
cmp_ok( $res->return_code, '==', 0, "Got expected address");
@ -89,4 +90,9 @@ SKIP: {
cmp_ok( $res->return_code, '==', 0, "Got expected fqdn");
like ( $res->output, $successOutput, "Output OK");
if($has_ipv6) {
$res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid -t 5 -6");
cmp_ok( $res->return_code, '==', 0, "Found $hostname_valid on $dns_server");
like ( $res->output, $successOutput, "Output OK for IPv6" );
}
}

16
plugins/t/check_tcp.t
View file

@ -6,19 +6,13 @@
use strict;
use Test;
use NPTest;
use vars qw($tests);
my $has_ipv6;
use vars qw($tests $has_ipv6);
BEGIN {
$tests = 11;
# do we have ipv6
`ping6 -c 1 2a02:2e0:3fe:100::7 2>&1`;
if($? == 0) {
$has_ipv6 = 1;
$tests += 3;
}
plan tests => $tests;
use NPTest;
$has_ipv6 = NPTest::has_ipv6();
$tests = $has_ipv6 ? 14 : 11;
plan tests => $tests;
}