From c90c53bac5f368ef8062320bcd31d4474a919f79 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 27 Feb 2020 09:16:12 +0000 Subject: [PATCH] Bug 24739: Skip tests when IPv6 support is found Content-Type: text/plain; charset=utf-8 Signed-off-by: David Cook Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy --- t/Koha/Middlware/RealIP.t | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/t/Koha/Middlware/RealIP.t b/t/Koha/Middlware/RealIP.t index a32577a876..28a45428e6 100644 --- a/t/Koha/Middlware/RealIP.t +++ b/t/Koha/Middlware/RealIP.t @@ -85,10 +85,22 @@ t::lib::Mocks::mock_config('koha_trusted_proxies', '1.1.1.0:255.255.255.0'); $address = Koha::Middleware::RealIP::get_real_ip( $remote_address, $x_forwarded_for_header ); is($address,'2.2.2.2',"Trust proxy (1.1.1.1) using an IP address and netmask separated by a colon, so use the X-Forwarded-For header for the remote address"); -$remote_address = "2001:db8:1234:5678:abcd:1234:abcd:1234"; -$x_forwarded_for_header = "2.2.2.2"; -t::lib::Mocks::mock_config('koha_trusted_proxies', '2001:db8:1234:5678::/64'); -warning_is { - $address = Koha::Middleware::RealIP::get_real_ip( $remote_address, $x_forwarded_for_header ); -} "could not parse 2001:db8:1234:5678::/64","Warn on IPv6 koha_trusted_proxies"; -is($address,'2001:db8:1234:5678:abcd:1234:abcd:1234',"IPv6 support was added in 1.9104 version of Net::Netmask"); +require Net::Netmask; +SKIP: { + skip "Net::Netmask at 1.9104+ supports IPv6", 2 unless Net::Netmask->VERSION < 1.9104; + + $remote_address = "2001:db8:1234:5678:abcd:1234:abcd:1234"; + $x_forwarded_for_header = "2.2.2.2"; + t::lib::Mocks::mock_config( 'koha_trusted_proxies', '2001:db8:1234:5678::/64' ); + warning_is { + $address = Koha::Middleware::RealIP::get_real_ip( $remote_address, + $x_forwarded_for_header ); + } + "could not parse 2001:db8:1234:5678::/64", + "Warn on IPv6 koha_trusted_proxies"; + is( + $address, + '2001:db8:1234:5678:abcd:1234:abcd:1234', + "IPv6 support was added in 1.9104 version of Net::Netmask" + ); +} -- 2.11.0