geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-08-30 04:01:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #520 from zachborboa/master

Browse Source 
Fix tests failing due to unexpected network error code
This commit is contained in:
Zach Borboa
2018-05-20 03:02:00 -07:00
committed by GitHub
parent bab7ee9782 fddd222575
commit c3a563260f
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/PHPCurlClass/PHPCurlClassTest.php
+9 -3
View File
@@ -1106,9 +1106,15 @@ class CurlTest extends \PHPUnit\Framework\TestCase
$test->curl->get(Test::ERROR_URL);
$this->assertTrue($test->curl->error);
$this->assertTrue($test->curl->curlError);
$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));
$possible_errors = array(CURLE_SEND_ERROR, CURLE_OPERATION_TIMEOUTED, CURLE_COULDNT_CONNECT);
$this->assertTrue(
in_array($test->curl->errorCode, $possible_errors, true),
'errorCode: ' . $test->curl->errorCode
);
$this->assertTrue(
in_array($test->curl->curlErrorCode, $possible_errors, true),
'curlErrorCode: ' . $test->curl->curlErrorCode
);
}
public function testErrorMessage()
tests/PHPCurlClass/PHPMultiCurlClassTest.php
+9 -3
View File
@@ -601,9 +601,15 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase
\PHPUnit\Framework\Assert::assertTrue($instance->error);
\PHPUnit\Framework\Assert::assertTrue($instance->curlError);
\PHPUnit\Framework\Assert::assertFalse($instance->httpError);
$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));
$possible_errors = array(CURLE_SEND_ERROR, CURLE_OPERATION_TIMEOUTED, CURLE_COULDNT_CONNECT);
\PHPUnit\Framework\Assert::assertTrue(
in_array($instance->errorCode, $possible_errors, true),
'errorCode: ' . $instance->errorCode
);
\PHPUnit\Framework\Assert::assertTrue(
in_array($instance->curlErrorCode, $possible_errors, true),
'curlErrorCode: ' . $instance->curlErrorCode
);
});
$multi_curl->addDelete(Test::ERROR_URL);