fix Archive*Test

tests/PHPUnit/Fixtures/ManySitesImportedLogs.php

@@ -24,6 +24,12 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Fixture
     
     public $addSegments = false;
 
+    public static function createAccessInstance()
+    {
+        Access::setSingletonInstance($access = new Test_Access_OverrideLogin());
+        \Piwik\Piwik::postEvent('Request.initAuthenticationObject');
+    }
+
     public function setUp()
     {
         $this->setUpWebsitesAndGoals();
@@ -61,7 +67,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Fixture
         }
     }
 
-    const SEGMENT_PRE_ARCHIVED = 'visitCount<=5;visitorType!=returning;daysSinceFirstVisit<=50';
+    const SEGMENT_PRE_ARCHIVED = 'visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50';
     const SEGMENT_PRE_ARCHIVED_CONTAINS_ENCODED = 'visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50';
 
     public function getDefaultSegments()
@@ -128,7 +134,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Fixture
             if (isset($info['enabledAllUsers'])) {
                 $enabledAllUsers = $info['enabledAllUsers'];
             }
-            
+
             APISegmentEditor::getInstance()->add($segmentName, $info['definition'], $idSite, $autoArchive, $enabledAllUsers);
         }
     }

tests/PHPUnit/Integration/ArchiveCronTest.php

@@ -21,12 +21,6 @@ class Test_Piwik_Integration_ArchiveCronTest extends IntegrationTestCase
 {
     public static $fixture = null; // initialized below class definition
 
-    public static function createAccessInstance()
-    {
-        Access::setSingletonInstance($access = new Test_Access_OverrideLogin());
-        \Piwik\Piwik::postEvent('Request.initAuthenticationObject');
-    }
-
     public function getApiForTesting()
     {
         $results = array();

tests/PHPUnit/Integration/ArchiveWebTest.php

@@ -19,12 +19,6 @@ class Test_Piwik_Integration_ArchiveWebTest extends IntegrationTestCase
 {
     public static $fixture = null; // initialized below class definition
 
-    public static function createAccessInstance()
-    {
-        Access::setSingletonInstance($access = new Test_Access_OverrideLogin());
-        \Piwik\Piwik::postEvent('Request.initAuthenticationObject');
-    }
-
     public function testWebArchiving()
     {
         if(self::isMysqli() && self::isTravisCI()) {