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
path: root/tests
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2015-02-11 08:53:11 +0300
committermattab <matthieu.aubry@gmail.com>2015-02-11 08:53:11 +0300
commitf8210860d36fe94aff836d81683086503163a663 (patch)
tree1697bc547187a279a22e3c203372b4e220f47c76 /tests
parent362ce854e8230ec5bda301dc467cbfdaa55c2a04 (diff)
Skipping some tests on the php 5.3 build, let's see if it helps
Diffstat (limited to 'tests')
-rwxr-xr-xtests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php15
1 files changed, 12 insertions, 3 deletions
diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
index 6cc8cbfbcc..56dc98e9a0 100755
--- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
+++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
@@ -38,9 +38,7 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase
*/
public function testApi($api, $params)
{
- if(self::isPhpVersion53() && self::isTravisCI()) {
- $this->markTestSkipped("Skipping this test as it often fails on travis)");
- }
+ $this->markTestSkippedOnPhp53();
$this->runApiTests($api, $params);
}
@@ -128,6 +126,8 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase
// plugins is non-trivial, so not done now.
public function test_Archive_getNumeric_ReturnsMetricsFromDifferentPlugins_WhenThoseMetricsAreRequested()
{
+ $this->markTestSkippedOnPhp53();
+
// Tests that getting a visits summary metric (nb_visits) & a Goal's metric (Goal_revenue)
// at the same time works.
$dateTimeRange = '2010-01-03,2010-01-06';
@@ -149,6 +149,8 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase
// plugins is non-trivial, so not done now.
public function test_Archive_getNumeric_shouldInvalidateRememberedReportsOncePerRequestIfNeeded()
{
+ $this->markTestSkippedOnPhp53();
+
// Tests that getting a visits summary metric (nb_visits) & a Goal's metric (Goal_revenue)
// at the same time works.
$dateTimeRange = '2010-01-03,2010-01-06';
@@ -217,6 +219,13 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase
{
return 'TwoVisitors_twoWebsites_differentDays_Conversions';
}
+
+ private function markTestSkippedOnPhp53()
+ {
+ if (self::isPhpVersion53() && self::isTravisCI()) {
+ $this->markTestSkipped("Skipping this test as it often fails on travis)");
+ }
+ }
}
TwoVisitorsTwoWebsitesDifferentDaysConversionsTest::$fixture = new TwoSitesTwoVisitorsDifferentDays();