mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8909 from owncloud/fix-temporary-storage-rmdirr-master 

use system function to recursive remove the directory used by temporary ...
This commit is contained in:
Thomas Müller 2014-06-06 10:02:23 +02:00
parent 79b65269c9 ad4ec414c9
commit ff651a3e0d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/files/storage/temporary.php
View File

@ -24,4 +24,8 @@ class Temporary extends Local{
parent::__destruct(); parent::__destruct();
$this->cleanUp(); $this->cleanUp();
} }
public function getDataDir() {
return $this->datadir;
}
} }

4
tests/lib/files/view.php
View File

@ -669,7 +669,6 @@ class View extends \PHPUnit_Framework_TestCase {
$rootView = new \OC\Files\View(''); $rootView = new \OC\Files\View('');
if ($param0 === '@0') { if ($param0 === '@0') {
$param0 = $longPath; $param0 = $longPath;
} }
@ -681,6 +680,9 @@ class View extends \PHPUnit_Framework_TestCase {
call_user_func(array($rootView, $operation), $longPath, $param0); call_user_func(array($rootView, $operation), $longPath, $param0);
if (!\OC_Util::runningOnWindows()) {
system('rm -rf ' . escapeshellarg($storage->getDataDir()));
}
} }
public function tooLongPathDataProvider() { public function tooLongPathDataProvider() {