improve test stability across db engines

matomo-org · Jul 4, 2024 · 241a585 · 241a585
1 parent 8960e89
commit 241a585
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
@@ -2531,7 +2531,7 @@ private function insertArchiveRow($idSite, $date, $periodLabel, $doneValue = Arc
 
     private function getInvalidatedArchiveTableEntries()
     {
-        return Db::fetchAll("SELECT idarchive, idsite, date1, date2, period, name, report FROM " . Common::prefixTable('archive_invalidations'));
+        return Db::fetchAll("SELECT idarchive, idsite, date1, date2, period, name, report FROM " . Common::prefixTable('archive_invalidations') . " ORDER BY idinvalidation");
     }
 
     private function assertEqualsSorted(array $expectedEntries, array $invalidatedArchiveTableEntries)
@@ -2554,7 +2554,7 @@ private function getInvalidatedArchiveTableEntriesSummary()
         Db::get()->query('SET SESSION group_concat_max_len=' . (128 * 1024));
 
         $table = Common::prefixTable('archive_invalidations');
-        return Db::fetchAll("SELECT idsite, period, name, report, GROUP_CONCAT(CONCAT(date1, ',', date2) SEPARATOR '|') as dates, COUNT(*) as count FROM $table GROUP BY idsite, period, name, report");
+        return Db::fetchAll("SELECT idsite, period, name, report, GROUP_CONCAT(CONCAT(date1, ',', date2) SEPARATOR '|') as dates, COUNT(*) as count FROM $table GROUP BY idsite, period, name, report ORDER BY idsite, period, name, report");
     }
 
     private static function addVisitToEachSite()