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:
commit
ff651a3e0d
|
@ -24,4 +24,8 @@ class Temporary extends Local{
|
|||
parent::__destruct();
|
||||
$this->cleanUp();
|
||||
}
|
||||
|
||||
public function getDataDir() {
|
||||
return $this->datadir;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -669,7 +669,6 @@ class View extends \PHPUnit_Framework_TestCase {
|
|||
|
||||
$rootView = new \OC\Files\View('');
|
||||
|
||||
|
||||
if ($param0 === '@0') {
|
||||
$param0 = $longPath;
|
||||
}
|
||||
|
@ -681,6 +680,9 @@ class View extends \PHPUnit_Framework_TestCase {
|
|||
|
||||
call_user_func(array($rootView, $operation), $longPath, $param0);
|
||||
|
||||
if (!\OC_Util::runningOnWindows()) {
|
||||
system('rm -rf ' . escapeshellarg($storage->getDataDir()));
|
||||
}
|
||||
}
|
||||
|
||||
public function tooLongPathDataProvider() {
|
||||
|
|
Loading…
Reference in New Issue