Try to prevent a deadlock when writing options (#15666)

2 files changed, 11 insertions, 9 deletions

diff --git a/plugins/PrivacyManager/tests/Integration/Model/DataSubjectsTest.php b/plugins/PrivacyManager/tests/Integration/Model/DataSubjectsTest.php
index a0e01fcef8..9d299998a1 100644
--- a/plugins/PrivacyManager/tests/Integration/Model/DataSubjectsTest.php
+++ b/plugins/PrivacyManager/tests/Integration/Model/DataSubjectsTest.php
@@ -366,7 +366,7 @@ class DataSubjectsTest extends IntegrationTestCase
         $this->removeArchiveInvalidationOptions();
 
         $visitDate = Date::factory($this->theFixture->dateTime);
-        $key = 'report_to_invalidate_' . $idSite . '_' . $visitDate->toString('Y-m-d') . '_12345';
+        $key = '4444_report_to_invalidate_' . $idSite . '_' . $visitDate->toString('Y-m-d') . '_12345';
         Option::set($key, '1');
 
         $this->assertArchivesHaveBeenInvalidated($visitDate, $idSite);
@@ -402,14 +402,14 @@ class DataSubjectsTest extends IntegrationTestCase
     private function assertArchivesHaveNotBeenInvalidated(Date $visitDate, $idSite)
     {
         $key = 'report_to_invalidate_' . $idSite . '_' . $visitDate->toString('Y-m-d');
-        $value = Option::getLike($key . '%');
+        $value = Option::getLike('%' . $key . '%');
         $this->assertEmpty($value);
     }
 
     private function assertArchivesHaveBeenInvalidated(Date $visitDate, $idSite)
     {
         $key = 'report_to_invalidate_' . $idSite . '_' . $visitDate->toString('Y-m-d');
-        $value = Option::getLike($key . '%');
+        $value = Option::getLike('%' . $key . '%');
         $this->assertNotEmpty($value);
         $this->assertEquals('1', array_values($value)[0]);
     }
@@ -508,7 +508,7 @@ class DataSubjectsTest extends IntegrationTestCase
 
     private function removeArchiveInvalidationOptions()
     {
-        Option::deleteLike('report_to_invalidate_%');
+        Option::deleteLike('%report_to_invalidate_%');
     }
 
     private function setWebsiteTimezone($idSite, $timezone)
diff --git a/plugins/SitesManager/tests/Integration/SitesManagerTest.php b/plugins/SitesManager/tests/Integration/SitesManagerTest.php
index 85cffe99ae..b90699b13a 100644
--- a/plugins/SitesManager/tests/Integration/SitesManagerTest.php
+++ b/plugins/SitesManager/tests/Integration/SitesManagerTest.php
@@ -63,12 +63,14 @@ class SitesManagerTest extends IntegrationTestCase
         $archive->rememberToInvalidateArchivedReportsLater($this->siteId, Date::factory('2014-04-06'));
         $archive->rememberToInvalidateArchivedReportsLater(4949, Date::factory('2014-04-05'));
 
-        $expected = array(
-            '2014-04-05' => array($this->siteId, 4949),
-            '2014-04-06' => array($this->siteId)
-        );
+        $remembered = $archive->getRememberedArchivedReportsThatShouldBeInvalidated();
+        $this->assertCount(2, $remembered);
 
-        $this->assertEquals($expected, $archive->getRememberedArchivedReportsThatShouldBeInvalidated());
+        sort($remembered['2014-04-05']);
+        $this->assertSame(array($this->siteId, 4949), $remembered['2014-04-05']);
+
+        sort($remembered['2014-04-06']);
+        $this->assertSame(array($this->siteId), $remembered['2014-04-06']);
 
         $this->manager->onSiteDeleted($this->siteId);