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

Fixing test

parent 7b4d97e9
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -172,7 +172,7 @@ class ArchiveProcessingTest extends DatabaseTestCase ...@@ -172,7 +172,7 @@ class ArchiveProcessingTest extends DatabaseTestCase
// we look at anything processed within the time to live range // we look at anything processed within the time to live range
$dateMinArchived = $now - Piwik_ArchiveProcessor_Rules::getTodayArchiveTimeToLive(); $dateMinArchived = $now - Piwik_ArchiveProcessor_Rules::getTodayArchiveTimeToLive();
$this->assertEquals($dateMinArchived, $archiveProcessor->getMinTimeArchivedProcessed()); $this->compareTimestamps($dateMinArchived, $archiveProcessor->getMinTimeArchivedProcessed());
$this->assertTrue($archiveProcessor->isArchiveTemporary()); $this->assertTrue($archiveProcessor->isArchiveTemporary());
// when browsers don't trigger archives, we force ArchiveProcessor // when browsers don't trigger archives, we force ArchiveProcessor
...@@ -214,7 +214,8 @@ class ArchiveProcessingTest extends DatabaseTestCase ...@@ -214,7 +214,8 @@ class ArchiveProcessingTest extends DatabaseTestCase
// we look at anything processed within the time to live range // we look at anything processed within the time to live range
$dateMinArchived = $now - Piwik_ArchiveProcessor_Rules::getTodayArchiveTimeToLive(); $dateMinArchived = $now - Piwik_ArchiveProcessor_Rules::getTodayArchiveTimeToLive();
$this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed(), $dateMinArchived); $minTimeArchivedProcessed = $archiveProcessor->getMinTimeArchivedProcessed();
$this->compareTimestamps($minTimeArchivedProcessed, $dateMinArchived);
$this->assertTrue($archiveProcessor->isArchiveTemporary()); $this->assertTrue($archiveProcessor->isArchiveTemporary());
// when browsers don't trigger archives, we force ArchiveProcessor // when browsers don't trigger archives, we force ArchiveProcessor
...@@ -226,7 +227,7 @@ class ArchiveProcessingTest extends DatabaseTestCase ...@@ -226,7 +227,7 @@ class ArchiveProcessingTest extends DatabaseTestCase
if (!Piwik_Common::isPhpCliMode()) { if (!Piwik_Common::isPhpCliMode()) {
$dateMinArchived = 0; $dateMinArchived = 0;
} }
$this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed(), $dateMinArchived); $this->compareTimestamps($archiveProcessor->getMinTimeArchivedProcessed(), $dateMinArchived);
// this test varies with DST // this test varies with DST
$this->assertTrue($archiveProcessor->getDateStart()->getDateStartUTC() == date('Y-m-d', $timestamp - 86400) . ' 22:00:00' || $this->assertTrue($archiveProcessor->getDateStart()->getDateStartUTC() == date('Y-m-d', $timestamp - 86400) . ' 22:00:00' ||
......
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