Removed Piwik::log and replace with calls to Log::... functions. Also changed logging level on travis.

3 files changed, 4 insertions, 3 deletions

diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php
index ba96ed231a..744d149ca8 100644
--- a/tests/PHPUnit/Integration/ArchiveCronTest.php
+++ b/tests/PHPUnit/Integration/ArchiveCronTest.php
@@ -124,7 +124,7 @@ class Test_Piwik_Integration_ArchiveCronTest extends IntegrationTestCase
         // run the command
         exec($cmd, $output, $result);
         if ($result !== 0) {
-            throw new Exception("log importer failed: " . implode("\n", $output) . "\n\ncommand used: $cmd");
+            throw new Exception("archive cron failed: " . implode("\n", $output) . "\n\ncommand used: $cmd");
         }
 
         return $output;
diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php
index 4d1be73b94..033e13ee16 100644
--- a/tests/PHPUnit/Plugins/UserCountryTest.php
+++ b/tests/PHPUnit/Plugins/UserCountryTest.php
@@ -129,7 +129,7 @@ class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase
 
     public function setUp()
     {
-        Piwik::$shouldLog = null;
+        // empty
     }
 
     public function tearDown()
diff --git a/tests/PHPUnit/config.ini.travis.php b/tests/PHPUnit/config.ini.travis.php
index 3c19606cc2..2c879461c4 100644
--- a/tests/PHPUnit/config.ini.travis.php
+++ b/tests/PHPUnit/config.ini.travis.php
@@ -17,4 +17,5 @@ tables_prefix        = piwiktests_
 ;charset        = utf8
 
 [log]
-logger_message[] = file
\ No newline at end of file
+log_writers[] = file
+log_level = debug
\ No newline at end of file