Skip to content
Extraits de code Groupes Projets
Valider 4b6d5248 rédigé par mattab's avatar mattab
Parcourir les fichiers

Skip some more random failing tests on php 5.3

parent de3b76d3
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -571,4 +571,11 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase ...@@ -571,4 +571,11 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase
ArchiveTableCreator::refreshTableList($forceReload = true); ArchiveTableCreator::refreshTableList($forceReload = true);
} }
protected function skipWhenPhp53()
{
if(\Piwik\Tests\Impl\SystemTestCase::isPhpVersion53()) {
$this->markTestSkipped('Sometimes fail on php 5.3');
}
}
} }
...@@ -83,6 +83,7 @@ class Core_CliMultiTest extends SystemTestCase ...@@ -83,6 +83,7 @@ class Core_CliMultiTest extends SystemTestCase
public function test_request_shouldRunAsync() public function test_request_shouldRunAsync()
{ {
$this->skipWhenPhp53();
$this->assertTrue($this->cliMulti->supportsAsync); $this->assertTrue($this->cliMulti->supportsAsync);
} }
...@@ -142,12 +143,14 @@ class Core_CliMultiTest extends SystemTestCase ...@@ -142,12 +143,14 @@ class Core_CliMultiTest extends SystemTestCase
*/ */
public function test_request_shouldDetectFinishOfRequest_IfNoParamsAreGiven() public function test_request_shouldDetectFinishOfRequest_IfNoParamsAreGiven()
{ {
$this->skipWhenPhp53();
$response = $this->cliMulti->request(array($this->completeUrl(''))); $response = $this->cliMulti->request(array($this->completeUrl('')));
$this->assertStringStartsWith('Error: no website was found', $response[0]); $this->assertStringStartsWith('Error: no website was found', $response[0]);
} }
public function test_request_shouldBeAbleToRenderARegularPageInPiwik() public function test_request_shouldBeAbleToRenderARegularPageInPiwik()
{ {
$this->skipWhenPhp53();
Fixture::createWebsite('2014-01-01 00:00:00'); Fixture::createWebsite('2014-01-01 00:00:00');
$urls = array($this->completeUrl('/?module=Widgetize&idSite=1&period=day&date=today')); $urls = array($this->completeUrl('/?module=Widgetize&idSite=1&period=day&date=today'));
......
...@@ -417,9 +417,7 @@ class Core_Plugin_SettingsTest extends IntegrationTestCase ...@@ -417,9 +417,7 @@ class Core_Plugin_SettingsTest extends IntegrationTestCase
public function test_getSettingsForCurrentUser_shouldReturnAllSettingsIfEnoughPermissionsAndSortThemBySettingOrder() public function test_getSettingsForCurrentUser_shouldReturnAllSettingsIfEnoughPermissionsAndSortThemBySettingOrder()
{ {
if(\Piwik\Tests\Impl\SystemTestCase::isPhpVersion53()) { $this->skipWhenPhp53();
$this->markTestSkipped('does not pass on PHP 5.3.3');
}
$this->setSuperUser(); $this->setSuperUser();
$this->addSystemSetting('mysystemsetting1', 'mytitle1'); $this->addSystemSetting('mysystemsetting1', 'mytitle1');
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter