While this fails the Plugin tests, let's see if it solves the random build issue on Travis CI

4 files changed, 4 insertions, 5 deletions

diff --git a/core/ArchiveProcessor/PluginsArchiver.php b/core/ArchiveProcessor/PluginsArchiver.php
index d6223fc97a..95a7ce527c 100644
--- a/core/ArchiveProcessor/PluginsArchiver.php
+++ b/core/ArchiveProcessor/PluginsArchiver.php
@@ -97,7 +97,7 @@ class PluginsArchiver
         }
 
         if (!$isAggregateForDay && $visits) {
-            //ArchiveSelector::purgeOutdatedArchives($this->params->getPeriod()->getDateStart());
+            ArchiveSelector::purgeOutdatedArchives($this->params->getPeriod()->getDateStart());
         }
     }
 
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index 6ddd26569a..1d143bd334 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -64,7 +64,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture
                                             'idSite'          => false,
                                             'autoArchive'     => false,
                                             'enabledAllUsers' => true),
-            'segmentOnlySuperuser' => array('definition'      => 'customVariablePageName1==HTTP-code',
+            'segmentOnlySuperuser' => array('definition'      => 'customVariablePageName1=='.urlencode('HTTP-code'),
                                             'idSite'          => false,
                                             'autoArchive'     => true,
                                             'enabledAllUsers' => false),
diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php
index ea12644985..8bfad68530 100644
--- a/tests/PHPUnit/Integration/ArchiveCronTest.php
+++ b/tests/PHPUnit/Integration/ArchiveCronTest.php
@@ -67,7 +67,7 @@ class Test_Piwik_Integration_ArchiveCronTest extends IntegrationTestCase
     {
         self::deleteArchiveTables();
         $this->setLastRunArchiveOptions();
-        $this->runArchivePhpCron($archivePhpOptions);
+        $output = $this->runArchivePhpCron($archivePhpOptions);
         
         foreach ($this->getApiForTesting() as $testInfo) {
             list($api, $params) = $testInfo;
@@ -78,7 +78,7 @@ class Test_Piwik_Integration_ArchiveCronTest extends IntegrationTestCase
             $params['testSuffix'] .= '_' . $optionGroupName;
             $params['disableArchiving'] = true;
             
-            // only do month for the last 3 option groups
+            // only do day for the last 3 option groups
             if ($optionGroupName != 'noOptions') {
                 $params['periods'] = array('day');
             }
@@ -98,7 +98,6 @@ class Test_Piwik_Integration_ArchiveCronTest extends IntegrationTestCase
             foreach ($idSites as $idSite) {
                 // lastRunKey() function inlined
                 $lastRunArchiveOption = "lastRunArchive" . $period . "_" . $idSite;
-                
                 \Piwik\Option::set($lastRunArchiveOption, $time);
             }
         }
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
-Subproject 475ed5a6754f8bc5a12cedf759ef72faaff173c
+Subproject 0de660f2d75b9f2013a480e45106e1496f645e9