git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set https options for tests
[plcapi.git]
/
test
/
testsuite.php
diff --git
a/test/testsuite.php
b/test/testsuite.php
index
39874ce
..
e5fb6d8
100644
(file)
--- a/
test/testsuite.php
+++ b/
test/testsuite.php
@@
-774,7
+774,7
@@
class LocalHostMultiTests extends LocalhostTests
function testHttps()
{
function testHttps()
{
- global $HTTPSSERVER, $HTTPSURI, $HTTPSIGNOREPEER;
+ global $HTTPSSERVER, $HTTPSURI, $HTTPSIGNOREPEER
, $HTTPSVERIFYHOST
;
if(!function_exists('curl_init'))
{
$this->fail('CURL missing: cannot test https functionality');
if(!function_exists('curl_init'))
{
$this->fail('CURL missing: cannot test https functionality');
@@
-784,15
+784,14
@@
class LocalHostMultiTests extends LocalhostTests
$this->method = 'https';
$this->client->method = 'https';
$this->client->path = $HTTPSURI;
$this->method = 'https';
$this->client->method = 'https';
$this->client->path = $HTTPSURI;
- $this->client->setSSLVerifyPeer( !$HTTPSIGNOREPEER );
- // silence warning with newish php versions
- $this->client->setSSLVerifyHost(2);
+ $this->client->setSSLVerifyPeer(!$HTTPSIGNOREPEER);
+ $this->client->setSSLVerifyHost($HTTPSVERIFYHOST);
$this->_runtests();
}
function testHttpsProxy()
{
$this->_runtests();
}
function testHttpsProxy()
{
- global $HTTPSSERVER, $HTTPSURI, $PROXYSERVER, $PROXYPORT, $NOPROXY;
+ global $HTTPSSERVER, $HTTPSURI, $
HTTPSIGNOREPEER, $HTTPSVERIFYHOST, $
PROXYSERVER, $PROXYPORT, $NOPROXY;
if(!function_exists('curl_init'))
{
$this->fail('CURL missing: cannot test https functionality');
if(!function_exists('curl_init'))
{
$this->fail('CURL missing: cannot test https functionality');
@@
-809,6
+808,8
@@
class LocalHostMultiTests extends LocalhostTests
$this->client->method = 'https';
$this->client->setProxy($PROXYSERVER, $PROXYPORT);
$this->client->path = $HTTPSURI;
$this->client->method = 'https';
$this->client->setProxy($PROXYSERVER, $PROXYPORT);
$this->client->path = $HTTPSURI;
+ $this->client->setSSLVerifyPeer(!$HTTPSIGNOREPEER);
+ $this->client->setSSLVerifyHost($HTTPSVERIFYHOST);
$this->_runtests();
}
$this->_runtests();
}
@@
-888,7
+889,7
@@
class ParsingBugsTests extends PHPUnit_TestCase
$m=new xmlrpcmsg('dummy');
$r=$m->parseResponse($response);
$v=$r->faultString();
$m=new xmlrpcmsg('dummy');
$r=$m->parseResponse($response);
$v=$r->faultString();
- $this->assertEquals('���
àüè
', $v);
+ $this->assertEquals('���
���
', $v);
}
function testValidNumbers()
}
function testValidNumbers()