Trying again

git-svn-id: http://dev.piwik.org/svn/trunk@7510 59fd770c-687e-43c8-a1e3-f5a4ff64c105

core/ArchiveProcessing/Period.php

@@ -385,7 +385,6 @@ class Piwik_ArchiveProcessing_Period extends Piwik_ArchiveProcessing
 		if(!self::$enablePurgeOutdated) {
 			return;
 		}
-		debug_print_backtrace();
 		$blobTable = str_replace("numeric", "blob", $numericTable);
 		$key = self::FLAG_TABLE_PURGED . $blobTable;
 		$timestamp = Piwik_GetOption($key);

tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php

@@ -161,10 +161,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ
         // Second new visitor on Idsite 1: one page view
         $visitorB = self::getTracker($idSite, $dateTime, $defaultInit = true);
         $visitorB->enableBulkTracking();
-        // calc token auth by hand in test environment
-        $tokenAuth = md5(
-            Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
-        $visitorB->setTokenAuth($tokenAuth);
+	    $visitorB->setTokenAuth(self::getTokenAuth());
         $visitorB->setIp('100.52.156.83');
         $visitorB->setResolution(800, 300);
         $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());

tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php

@@ -113,9 +113,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisa
         $visitorB = self::getTracker($idSite, $dateTime, $defaultInit = true);
         $visitorB->enableBulkTracking();
         // calc token auth by hand in test environment
-        $tokenAuth = md5(
-            Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
-        $visitorB->setTokenAuth($tokenAuth);
+        $visitorB->setTokenAuth(self::getTokenAuth());
         $visitorB->setIp('100.52.156.83');
         $visitorB->setResolution(800, 300);
         $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());

tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php

@@ -155,9 +155,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions e
         $visitorB = self::getTracker($idSite, $dateTime, $defaultInit = true);
         $visitorB->enableBulkTracking();
         // calc token auth by hand in test environment
-        $tokenAuth = md5(
-            Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
-        $visitorB->setTokenAuth($tokenAuth);
+	    $visitorB->setTokenAuth(self::getTokenAuth());
         $visitorB->setIp('100.52.156.83');
         $visitorB->setResolution(800, 300);
         $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());

tests/PHPUnit/Plugins/PrivacyManagerTest.php

@@ -615,12 +615,12 @@ class PrivacyManagerTest extends IntegrationTestCase
         //   - http://whatever.com/42/{$daysSinceLastVisit}
         
         $start = Piwik_Date::factory(self::$dateTime);
-        self::createWebsite('2012-01-01', $ecommerce=1);
+	    self::$idSite = self::createWebsite('2012-01-01', $ecommerce=1);
         $idGoal = Piwik_Goals_API::getInstance()->addGoal(self::$idSite, 'match all', 'url', 'http', 'contains');
         
         $t = IntegrationTestCase::getTracker(self::$idSite, $start, $defaultInit = true);
         $t->enableBulkTracking();
-        $t->setTokenAuth(IntegrationTestCase::getTokenAuth());
+        $t->setTokenAuth(self::getTokenAuth());
         for ($daysAgo = self::$daysAgoStart; $daysAgo >= 0; $daysAgo -= 5) // one visit every 5 days
         {
             $dateTime = $start->subDay($daysAgo)->toString();