New upstream version 2.3.2
This commit is contained in:
		
							parent
							
								
									09f4277f49
								
							
						
					
					
						commit
						21323d25dd
					
				
					 104 changed files with 34386 additions and 7430 deletions
				
			
		| 
						 | 
				
			
			@ -19,7 +19,7 @@ if ($allow_sudo eq "yes" or $> == 0) {
 | 
			
		|||
my $sudo = $> == 0 ? '' : 'sudo';
 | 
			
		||||
 | 
			
		||||
my $successOutput = '/OK: Received \d+ DHCPOFFER\(s\), \d+ of 1 requested servers responded, max lease time = \d+ sec\./';
 | 
			
		||||
my $failureOutput = '/CRITICAL: No DHCPOFFERs were received/';
 | 
			
		||||
my $failureOutput = '/CRITICAL: (No DHCPOFFERs were received|Received \d+ DHCPOFFER\(s\), 0 of 1 requested servers responded, max lease time = \d+ sec\.)/';
 | 
			
		||||
my $invalidOutput = '/Invalid hostname/';
 | 
			
		||||
 | 
			
		||||
my $host_responsive    = getTestParameter( "NP_HOST_DHCP_RESPONSIVE",
 | 
			
		||||
| 
						 | 
				
			
			@ -36,7 +36,12 @@ my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
 | 
			
		|||
 | 
			
		||||
# try to determince interface
 | 
			
		||||
my $interface = '';
 | 
			
		||||
if(`ifconfig -a 2>/dev/null` =~ m/^(e\w*\d+)/mx and $1 ne 'eth0') {
 | 
			
		||||
 | 
			
		||||
# find interface used for default route
 | 
			
		||||
if (-x '/usr/sbin/ip' and `/usr/sbin/ip route get 1.1.1.1 2>/dev/null` =~ m/\sdev\s(\S+)/) {
 | 
			
		||||
    $interface = "-i $1";
 | 
			
		||||
}
 | 
			
		||||
elsif (`ifconfig -a 2>/dev/null` =~ m/^(e\w*\d+)/mx and $1 ne 'eth0') {
 | 
			
		||||
    $interface = ' -i '.$1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,7 +12,7 @@ my $allow_sudo = getTestParameter( "NP_ALLOW_SUDO",
 | 
			
		|||
	"no" );
 | 
			
		||||
 | 
			
		||||
if ($allow_sudo eq "yes" or $> == 0) {
 | 
			
		||||
	plan tests => 16;
 | 
			
		||||
	plan tests => 20;
 | 
			
		||||
} else {
 | 
			
		||||
	plan skip_all => "Need sudo to test check_icmp";
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -83,3 +83,14 @@ $res = NPTest->testCmd(
 | 
			
		|||
is( $res->return_code, 2, "One of two host nonresponsive - two required" );
 | 
			
		||||
like( $res->output, $failureOutput, "Output OK" );
 | 
			
		||||
 | 
			
		||||
$res = NPTest->testCmd(
 | 
			
		||||
	"$sudo ./check_icmp -H $host_responsive -s 127.0.15.15 -w 10000ms,100% -c 10000ms,100% -n 1 -m 2"
 | 
			
		||||
	);
 | 
			
		||||
is( $res->return_code, 0, "IPv4 source_ip accepted" );
 | 
			
		||||
like( $res->output, $successOutput, "Output OK" );
 | 
			
		||||
 | 
			
		||||
$res = NPTest->testCmd(
 | 
			
		||||
	"$sudo ./check_icmp -H $host_responsive -b 65507"
 | 
			
		||||
	);
 | 
			
		||||
is( $res->return_code, 0, "Try max paket size" );
 | 
			
		||||
like( $res->output, $successOutput, "Output OK - Didn't overflow" );
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue