Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2020-03-05 06:40:33 +0300
committerGitHub <noreply@github.com>2020-03-05 06:40:33 +0300
commit6a3fc7d70e231f5b50f1df56c3741cd4c9535fdc (patch)
tree4d2a5b443db90641aa47c1bfff66234de69a7722 /plugins/PrivacyManager
parent0fd0b3039b23524e5959c2243a25fe2ff53db175 (diff)
Try to prevent a deadlock when writing options (#15666)
Diffstat (limited to 'plugins/PrivacyManager')
-rw-r--r--plugins/PrivacyManager/tests/Integration/Model/DataSubjectsTest.php8
1 files changed, 4 insertions, 4 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)