fixing build, another attempt

plugins/UserCountry/LocationProvider.php

@@ -300,6 +300,7 @@ abstract class Piwik_UserCountry_LocationProvider
 				"Invalid provider ID '$providerId'. The provider either does not exist or is not available");
 		}
 		Piwik_SetOption(self::CURRENT_PROVIDER_OPTION_NAME, $providerId);
+		Piwik_Tracker_Cache::clearCacheGeneral();
 		return $provider;
 	}
 	

tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php

@@ -203,6 +203,11 @@ class Test_Piwik_Integration_ManyVisitorsOneWebsiteTest extends IntegrationTestC
 		Piwik_UserCountry_LocationProvider::$providers = null;
 		Piwik_UserCountry_LocationProvider::setCurrentProvider(self::GEOIP_IMPL_TO_TEST);
 		
+		if (Piwik_UserCountry_LocationProvider::getCurrentProviderId() !== self::GEOIP_IMPL_TO_TEST)
+		{
+			throw new Exception("Failed to set the current location provider to '".self::GEOIP_IMPL_TO_TEST."'.");
+		}
+		
 		$possibleFiles = Piwik_UserCountry_LocationProvider_GeoIp::$dbNames['loc'];
 		if (Piwik_UserCountry_LocationProvider_GeoIp::getPathToGeoIpDatabase($possibleFiles) === false)
 		{