Refs #3456, fixing build.

matomo-org · Feb 16, 2013 · a2e7a87 · a2e7a87
1 parent 91098c7
commit a2e7a87
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php
@@ -99,17 +99,18 @@ public function testGeoIpUpdaterRedundantChecks()
     public function tearDown()
     {
     	$geoIpDirPath = PIWIK_INCLUDE_PATH.'/tests/lib/geoip-files';
-    	if (file_exists($geoIpDirPath.'/GeoIPISP.dat.broken'))
-    	{
-    		unlink($geoIpDirPath.'/GeoIPISP.dat.broken');
-    	}
+    	$filesToRemove = array('GeoIPISP.dat.broken', 'GeoIPOrg.dat.broken', 'GeoIPISP.dat', 'GeoIPOrg.dat');
 
-    	if (file_exists($geoIpDirPath.'/GeoIPOrg.dat.broken'))
+    	foreach ($filesToRemove as $name)
     	{
-    		unlink($geoIpDirPath.'/GeoIPOrg.dat.broken');
+    		$path = $geoIpDirPath.'/'.$name;
+    		if (file_exists($path))
+    		{
+    			unlink($path);
+    		}
     	}
     }
-    
+	
     private function createEmptyISPOrgFiles()
     {
     	$geoIpDir = PIWIK_INCLUDE_PATH.'/tests/lib/geoip-files';