geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-09-13 11:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #519 from zachborboa/master

Browse Source 
Fix failure tests erroring with mismatching error codes
This commit is contained in:
Zach Borboa
2018-04-29 02:47:07 -07:00
committed by GitHub
parent 3a6f673b83 90f4552563
commit bab7ee9782
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/PHPCurlClass/Helper.php
+1 -1
View File
@@ -7,7 +7,7 @@ use Curl\Curl;
class Test
{
const TEST_URL = 'http://127.0.0.1:8000/';
const ERROR_URL = 'https://1.2.3.4/';
const ERROR_URL = 'http://1.2.3.4/';
public function __construct()
{
tests/PHPCurlClass/PHPCurlClassTest.php
+3 -3
View File
@@ -1103,12 +1103,12 @@ class CurlTest extends \PHPUnit\Framework\TestCase
public function testError()
{
$test = new Test();
$test->curl->setOpt(CURLOPT_CONNECTTIMEOUT_MS, 4000);
$test->curl->get(Test::ERROR_URL);
$this->assertTrue($test->curl->error);
$this->assertTrue($test->curl->curlError);
$this->assertEquals(CURLE_OPERATION_TIMEOUTED, $test->curl->errorCode);
$this->assertEquals(CURLE_OPERATION_TIMEOUTED, $test->curl->curlErrorCode);
$possible_errors = array(CURLE_SEND_ERROR, CURLE_OPERATION_TIMEOUTED);
$this->assertTrue(in_array($test->curl->errorCode, $possible_errors, true));
$this->assertTrue(in_array($test->curl->curlErrorCode, $possible_errors, true));
}
public function testErrorMessage()
tests/PHPCurlClass/PHPMultiCurlClassTest.php
+3 -2
View File
@@ -601,8 +601,9 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase
\PHPUnit\Framework\Assert::assertTrue($instance->error);
\PHPUnit\Framework\Assert::assertTrue($instance->curlError);
\PHPUnit\Framework\Assert::assertFalse($instance->httpError);
\PHPUnit\Framework\Assert::assertEquals(CURLE_OPERATION_TIMEOUTED, $instance->errorCode);
\PHPUnit\Framework\Assert::assertEquals(CURLE_OPERATION_TIMEOUTED, $instance->curlErrorCode);
$possible_errors = array(CURLE_SEND_ERROR, CURLE_OPERATION_TIMEOUTED);
\PHPUnit\Framework\Assert::assertTrue(in_array($instance->errorCode, $possible_errors, true));
\PHPUnit\Framework\Assert::assertTrue(in_array($instance->curlErrorCode, $possible_errors, true));
});
$multi_curl->addDelete(Test::ERROR_URL);