Merge pull request #2928 from Dolibarr/revert-1446-removefiles

Revert "Made test pessimistic by default"
Dolibarr · May 29, 2015 · 92440d1 · 92440d1
2 parents eb62c7e + d925ecb
commit 92440d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
@@ -802,7 +802,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
  */
 function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=null)
 {
-	global $langs;
+	global $db, $conf, $user, $langs;
 	global $hookmanager;
 
 	$langs->load("other");
@@ -829,8 +829,10 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 	}
 	else
 	{
+		$error=0;
+
 		//print "x".$file." ".$disableglob;exit;
-		$ok=false;
+		$ok=true;
 		$file_osencoded=dol_osencode($file);    // New filename encoded in OS filesystem encoding charset
 		if (empty($disableglob) && ! empty($file_osencoded))
 		{

diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
@@ -339,9 +339,10 @@ public function testDolCopyMoveDelete()
         print __METHOD__." result=".$result."\n";
         $this->assertTrue($result,'delete file');
 
+        // Again to test no error when deleteing a non existing file
         $result=dol_delete_file($conf->admin->dir_temp.'/file2.csv');
         print __METHOD__." result=".$result."\n";
-        $this->assertFalse($result,'delete file that does not exists');
+        $this->assertTrue($result,'delete file that does not exists');
 
         // Test copy with special char / delete with blob
         $result=dol_copy($file, $conf->admin->dir_temp.'/file with [x] and é.csv',0,1);