Fixing build, more debug output finagling.

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

plugins/Login/Auth.php

@@ -86,7 +86,7 @@ class Piwik_Login_Auth implements Piwik_Auth
 		
 		if ($this->token_auth !== null)
 		{
-			echo "\nROOT LOGIN: '$rootLogin'\nROOT TOKEN: '$rootToken'\nAUTH SUPPLIED: '{$this->token_auth}\n'";
+			echo "\nCHECKING AUTH - ROOT LOGIN: '$rootLogin'\nROOT TOKEN: '$rootPassword'\n";
 		}
 
 		return new Piwik_Auth_Result( Piwik_Auth_Result::FAILURE, $this->login, $this->token_auth );

tests/PHPUnit/IntegrationTestCase.php

@@ -572,7 +572,12 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
 	 */
 	public static function getTokenAuth()
 	{
-	    return md5(Zend_Registry::get('config')->superuser->login . Zend_Registry::get('config')->superuser->password);
+		echo "GETTING TOKEN AUTH - LOGIN: '".Zend_Registry::get('config')->superuser->login."'\n".
+			"PASSWORD: '".Zend_Registry::get('config')->superuser->password."'\n";
+	    return Piwik_UsersManager_API::getInstance()->getTokenAuth(
+	    	Zend_Registry::get('config')->superuser->login,
+	    	Zend_Registry::get('config')->superuser->password
+    	);
     }
 
     /**