Catch all exceptions

tests/PHPUnit/Fixtures/ManySitesImportedLogs.php

@@ -41,11 +41,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Fixture
     {
         LocationProvider::$providers = null;
         GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
-        try {
-            LocationProvider::setCurrentProvider('default');
-        } catch(Exception $e) {
-
-        }
+        Test_Piwik_Fixture_ManyVisitsWithGeoIP::unsetLocationProvider();
     }
 
     public function setUpWebsitesAndGoals()

tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php

@@ -236,9 +236,13 @@ class Test_Piwik_Fixture_ManyVisitsWithGeoIP extends Fixture
         );
     }
 
-    private function unsetLocationProvider()
+    static public function unsetLocationProvider()
     {
-        LocationProvider::setCurrentProvider('default');
+        try {
+            LocationProvider::setCurrentProvider('default');
+        } catch(Exception $e) {
+            // ignore error
+        }
     }
 
 }

tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php

@@ -34,7 +34,7 @@ class Test_Piwik_Fixture_ManyVisitsWithMockLocationProvider extends Fixture
 
     public function tearDown()
     {
-        $this->unsetMockLocationProvider();
+        Test_Piwik_Fixture_ManyVisitsWithGeoIP::unsetLocationProvider();
     }
 
     private function setUpWebsitesAndGoals()
@@ -219,8 +219,4 @@ class Test_Piwik_Fixture_ManyVisitsWithMockLocationProvider extends Fixture
         );
     }
 
-    private function unsetMockLocationProvider()
-    {
-        LocationProvider::setCurrentProvider('default');
-    }
 }