Fix failures

main
Jordi Boggiano 10 years ago
parent 8dad846613
commit da881c118b

@ -46,6 +46,9 @@ class CacheTest extends TestCase
public function testRemoveOutdatedFiles() public function testRemoveOutdatedFiles()
{ {
// sleeping a bit to let the filesystem cool down on travis or it has intermittent failures
usleep(50000);
$outdated = array_slice($this->files, 1); $outdated = array_slice($this->files, 1);
$this->finder $this->finder
->expects($this->once()) ->expects($this->once())
@ -66,6 +69,9 @@ class CacheTest extends TestCase
public function testRemoveFilesWhenCacheIsTooLarge() public function testRemoveFilesWhenCacheIsTooLarge()
{ {
// sleeping a bit to let the filesystem cool down on travis or it has intermittent failures
usleep(50000);
$emptyFinder = $this->getMockBuilder('Symfony\Component\Finder\Finder')->disableOriginalConstructor()->getMock(); $emptyFinder = $this->getMockBuilder('Symfony\Component\Finder\Finder')->disableOriginalConstructor()->getMock();
$emptyFinder $emptyFinder
->expects($this->once()) ->expects($this->once())

@ -154,6 +154,10 @@ class StreamContextFactoryTest extends \PHPUnit_Framework_TestCase
public function testHttpsProxyOverride() public function testHttpsProxyOverride()
{ {
if (!extension_loaded('openssl')) {
$this->markTestSkipped('Requires openssl');
}
$_SERVER['http_proxy'] = 'http://username:password@proxyserver.net'; $_SERVER['http_proxy'] = 'http://username:password@proxyserver.net';
$_SERVER['https_proxy'] = 'https://woopproxy.net'; $_SERVER['https_proxy'] = 'https://woopproxy.net';

Loading…
Cancel
Save