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:
authorStefan Giehl <stefan@matomo.org>2021-05-25 21:09:21 +0300
committerGitHub <noreply@github.com>2021-05-25 21:09:21 +0300
commitdd744fe3516a29c6a839c5b62da7ffd91c4906fe (patch)
tree364a78c61d3102944f20238a0030b4b26ecbbd2c
parent0aa4ca5223937e34f0d97903ea1f4bca169360b1 (diff)
Fix uncaught exception when running system tests for plugins (#17618)
* Fix uncaught exception when running system tests for plugins * updates expected test files
-rw-r--r--plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml4
-rw-r--r--plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemName__API.getSuggestedValuesForSegment.xml2
-rw-r--r--plugins/CoreHome/Columns/VisitorId.php16
3 files changed, 17 insertions, 5 deletions
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml
index bd71cd93b2..4795b34719 100644
--- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml
@@ -4,6 +4,7 @@
<row>2345 Browser</row>
<row>360 Phone Browser</row>
<row>360 Browser</row>
+ <row>7654 Browser</row>
<row>Avant Browser</row>
<row>ABrowse</row>
<row>ANT Fresco</row>
@@ -121,6 +122,7 @@
<row>GOG Galaxy</row>
<row>HasBrowser</row>
<row>Hawk Turbo Browser</row>
+ <row>Helio</row>
<row>hola! Browser</row>
<row>HotJava</row>
<row>Huawei Browser</row>
@@ -197,6 +199,7 @@
<row>Opera Mini iOS</row>
<row>Obigo</row>
<row>Odin</row>
+ <row>OceanHero</row>
<row>Odyssey Web Browser</row>
<row>Off By One</row>
<row>OhHai Browser</row>
@@ -235,6 +238,7 @@
<row>PolyBrowser</row>
<row>PrivacyWall</row>
<row>Microsoft Edge</row>
+ <row>Qazweb</row>
<row>QQ Browser Lite</row>
<row>QQ Browser Mini</row>
<row>QQ Browser</row>
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemName__API.getSuggestedValuesForSegment.xml
index 541a0fb563..4037c281d5 100644
--- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemName__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemName__API.getSuggestedValuesForSegment.xml
@@ -18,6 +18,7 @@
<row>Debian</row>
<row>Deepin</row>
<row>DragonFly</row>
+ <row>DVKBuntu</row>
<row>Fedora</row>
<row>Fenix</row>
<row>Firefox OS</row>
@@ -38,6 +39,7 @@
<row>Kubuntu</row>
<row>GNU/Linux</row>
<row>Lubuntu</row>
+ <row>Lumin OS</row>
<row>VectorLinux</row>
<row>Mac</row>
<row>Maemo</row>
diff --git a/plugins/CoreHome/Columns/VisitorId.php b/plugins/CoreHome/Columns/VisitorId.php
index 6d7643984e..f6b29699b3 100644
--- a/plugins/CoreHome/Columns/VisitorId.php
+++ b/plugins/CoreHome/Columns/VisitorId.php
@@ -44,12 +44,18 @@ class VisitorId extends VisitDimension
public function configureSegments(SegmentsList $segmentsList, DimensionSegmentFactory $dimensionSegmentFactory)
{
- $systemSettings = new SystemSettings();
- $a = $systemSettings->disableVisitorProfile->getValue();
- $b = $systemSettings->disableVisitorLog->getValue();
+ try {
+ $systemSettings = new SystemSettings();
+ $visitorProfileEnabled = $systemSettings->disableVisitorProfile->getValue() === false
+ && $systemSettings->disableVisitorLog->getValue() === false;
+ } catch (\Zend_Db_Exception $e) {
+ // when running tests the db might not yet be set up when fetching available segments
+ if (!defined('PIWIK_TEST_MODE') || !PIWIK_TEST_MODE) {
+ throw $e;
+ }
+ $visitorProfileEnabled = true;
+ }
- $visitorProfileEnabled = $systemSettings->disableVisitorProfile->getValue() === false
- && $systemSettings->disableVisitorLog->getValue() === false;
if ($visitorProfileEnabled) {
parent::configureSegments($segmentsList, $dimensionSegmentFactory);
}