Attachment 121024 Details for Bug 28200 – Bug 28200: [Alternate] Remove unit test using abbreviated format

[patch] Bug 28200: [Alternate] Remove unit test using abbreviated format

Bug-28200-Alternate-Remove-unit-test-using-abbrevi.patch (text/plain), 2.00 KB, created by Alvaro Cornejo on 2021-05-17 00:18:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alvaro Cornejo

Created: 2021-05-17 00:18:03 UTC

Size: 2.00 KB

patch

obsolete

>From 88c9fb3ee918afe20f9e8f723d3d72e7087a358d Mon Sep 17 00:00:00 2001
>From: David Cook <dcook@prosentient.com.au>
>Date: Mon, 10 May 2021 23:33:19 +0000
>Subject: [PATCH] Bug 28200: [Alternate] Remove unit test using abbreviated
> format
>
>This patch removes the unit test that uses the abbreviated format,
>since it's not supported in newer versions of Net::Netmask without
>a workaround.
>
>Test plan:
>0. Set up Koha dev environment on Debian 11
>1. perl t/Koha/Middleware/RealIP.t
>2. Tests should pass
>
>Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Signed-off-by: Alvaro Cornejo <cornejo.alvaro@gmail.com>
>---
> t/Koha/Middleware/RealIP.t | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
>diff --git a/t/Koha/Middleware/RealIP.t b/t/Koha/Middleware/RealIP.t
>index c60994b189..2ec8e51b89 100755
>--- a/t/Koha/Middleware/RealIP.t
>+++ b/t/Koha/Middleware/RealIP.t
>@@ -100,19 +100,13 @@ subtest "Success multiple proxies" => sub {
> };
> 
> subtest "Test alternative configuration styles" => sub {
>-    plan tests => 3;
>+    plan tests => 2;
>     $remote_address = "2.2.2.2";
>     $x_forwarded_for_header = "1.1.1.1";
>     t::lib::Mocks::mock_config('koha_trusted_proxies', '2.2.2.0/24');
>     $address = Koha::Middleware::RealIP::get_real_ip( $remote_address, $x_forwarded_for_header );
>     is($address,'1.1.1.1',"Trust proxy (2.2.2.2) using CIDR notation, so use the X-Forwarded-For header for the remote address");
> 
>-    $remote_address = "2.2.2.2";
>-    $x_forwarded_for_header = "1.1.1.1";
>-    t::lib::Mocks::mock_config('koha_trusted_proxies', '2.2.2');
>-    $address = Koha::Middleware::RealIP::get_real_ip( $remote_address, $x_forwarded_for_header );
>-    is($address,'1.1.1.1',"Trust proxy (2.2.2.2) using abbreviated notation, so use the X-Forwarded-For header for the remote address");
>-
>     $remote_address = "2.2.2.2";
>     $x_forwarded_for_header = "1.1.1.1";
>     t::lib::Mocks::mock_config('koha_trusted_proxies', '2.2.2.0:255.255.255.0');
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 28200: 120035 | 120350 | 120818 | 120851 | 120911 | 121024