From 4f277229e1ebd89476f3b3509c9fd707e5e40f2a Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 12 Nov 2013 14:48:08 +1300
Subject: [PATCH] Trying a different fix for the random build failure
---
tests/PHPUnit/proxy/includes.php | 6 ++++++
tests/PHPUnit/proxy/index.php | 4 ----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/PHPUnit/proxy/includes.php b/tests/PHPUnit/proxy/includes.php
index 177940803b..99f41cf1dc 100644
--- a/tests/PHPUnit/proxy/includes.php
+++ b/tests/PHPUnit/proxy/includes.php
@@ -13,3 +13,9 @@ require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php';
\Piwik\SettingsServer::setMaxExecutionTime(0);
+
+// Make sure Data processed in archive.php is not being purged instantly (useful for: Integration/ArchiveCronTest)
+if(\Piwik\SettingsServer::isArchivePhpTriggered()) {
+ \Piwik\ArchiveProcessor\Rules::$purgeDisabledByTests = true;
+}
+
diff --git a/tests/PHPUnit/proxy/index.php b/tests/PHPUnit/proxy/index.php
index 0fc9ce9642..c0c0c6166d 100644
--- a/tests/PHPUnit/proxy/index.php
+++ b/tests/PHPUnit/proxy/index.php
@@ -21,10 +21,6 @@ Cache::deleteTrackerCache();
define('PIWIK_ENABLE_DISPATCH', false);
include PIWIK_INCLUDE_PATH . '/index.php';
-// Make sure Data processed in archive.php is not being purged instantly (useful for: Integration/ArchiveCronTest)
-if(\Piwik\SettingsServer::isArchivePhpTriggered()) {
- \Piwik\ArchiveProcessor\Rules::$purgeDisabledByTests = true;
-}
$controller = \Piwik\FrontController::getInstance();
// Load all plugins that are found so UI tests are really testing real world use case
--
GitLab