From 00da9b125d19743a8997ccb26eabe5be9a509ad0 Mon Sep 17 00:00:00 2001 From: johnstevenson Date: Sat, 30 Nov 2019 15:45:54 +0000 Subject: [PATCH] Tidy and fix tests --- tests/Composer/Test/Util/NoProxyPatternTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Composer/Test/Util/NoProxyPatternTest.php b/tests/Composer/Test/Util/NoProxyPatternTest.php index 05d149e21..a3c01546c 100644 --- a/tests/Composer/Test/Util/NoProxyPatternTest.php +++ b/tests/Composer/Test/Util/NoProxyPatternTest.php @@ -56,7 +56,7 @@ class NoProxyPatternTest extends TestCase public function dataIpAddress() { - $noproxy = '192.168.1.1, 192.168.1.2, 192.168.1.3, 2001:db8::52:0:1'; + $noproxy = '192.168.1.1, 2001:db8::52:0:1'; // noproxy, url, expected return array( @@ -81,14 +81,14 @@ class NoProxyPatternTest extends TestCase public function dataIpRange() { - $noproxy = '10.0.0.0/30, 2002:db8:a::45/64'; + $noproxy = '10.0.0.0/30, 2002:db8:a::45/121'; // noproxy, url, expected return array( 'match IPv4/CIDR' => array($noproxy, '10.0.0.2', true), 'no match IPv4/CIDR' => array($noproxy, '10.0.0.4', false), - 'match IPv6/CIDR' => array($noproxy, '[2002:db8:a:0:0:0:0:123]', true), - 'no match IPv6' => array($noproxy, '[2001:db8::52:0:2]', false), + 'match IPv6/CIDR' => array($noproxy, '[2002:db8:a:0:0:0:0:7f]', true), + 'no match IPv6' => array($noproxy, '[2002:db8:a:0:0:0:0:ff]', false), 'match mapped IPv4' => array($noproxy, '[::FFFF:0A00:0002]', true), 'no match mapped IPv4' => array($noproxy, '[::FFFF:0A00:0004]', false), );