From: gggeek Date: Thu, 24 Nov 2022 17:53:57 +0000 (+0000) Subject: enable https-via-socket tests on php 5.6 and less on bionic and lower, as it seems... X-Git-Tag: 4.9.0~22 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4acd797d6e504dbd3ddda13aea71aab0c56ee285;p=plcapi.git enable https-via-socket tests on php 5.6 and less on bionic and lower, as it seems to work --- diff --git a/tests/6HTTPTest.php b/tests/6HTTPTest.php index c2c3c19d..e737f81a 100644 --- a/tests/6HTTPTest.php +++ b/tests/6HTTPTest.php @@ -260,14 +260,7 @@ class HTTPTest extends ServerTest } /// @todo investigate: can we make this work? - if (version_compare(PHP_VERSION, '5.6.0', '<')) - { - $this->markTestSkipped('HTTPS via Socket known to fail on php 5.5 and earlier'); - return; - } - - /// @todo investigate: can we make this work? - if (version_compare(PHP_VERSION, '5.6.1', '>=') && version_compare(PHP_VERSION, '7.2', '<')) + if (version_compare(PHP_VERSION, '7.2', '<')) { if (is_readable('/etc/os-release')) { $output = file_get_contents('/etc/os-release'); @@ -279,8 +272,7 @@ class HTTPTest extends ServerTest $ubuntuVersion = @$matches[1]; } if ($ubuntuVersion >= 20) { - /// @todo investigate: can we make this work? - $this->markTestSkipped('HTTPS via Socket known to fail on php 5.6.1 to 7.1 on Ubuntu 20 and higher'); + $this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher'); return; } }