Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-06-28 15:42:13 +02:00
commit ef6085d551

View File

@ -168,6 +168,46 @@ class UtilTest extends PMATestCase
$this->validateHttp($result, $expected);
}
/**
* Test for http request using Curl with CURLOPT_CAPATH
*
* @group medium
*
* @return void
*
* @dataProvider httpRequests
*
* @group network
*/
public function testHttpRequestCurlCAPath($url, $method, $return_only_status, $expected)
{
if (! function_exists('curl_init')) {
$this->markTestSkipped('curl not supported');
}
$result = PMA\libraries\Util::httpRequestCurl($url, $method, $return_only_status, null, '', CURLOPT_CAPATH);
$this->validateHttp($result, $expected);
}
/**
* Test for http request using Curl with CURLOPT_CAINFO
*
* @group medium
*
* @return void
*
* @dataProvider httpRequests
*
* @group network
*/
public function testHttpRequestCurlCAInfo($url, $method, $return_only_status, $expected)
{
if (! function_exists('curl_init')) {
$this->markTestSkipped('curl not supported');
}
$result = PMA\libraries\Util::httpRequestCurl($url, $method, $return_only_status, null, '', CURLOPT_CAINFO);
$this->validateHttp($result, $expected);
}
/**
* Test for http request using fopen
*