diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-05 21:00:50 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-06 09:29:31 +0200 |
| commit | ad4ec414c9e1cf4ff8189040a132ec81bf1fd377 (patch) | |
| tree | 2bebd1edf3104f2bfc4f49b988ed2251c1898c70 | |
| parent | 70e0ae063739b9749883bd184fee0a80f184685b (diff) | |
| download | nextcloud-server-ad4ec414c9e1cf4ff8189040a132ec81bf1fd377.tar.gz nextcloud-server-ad4ec414c9e1cf4ff8189040a132ec81bf1fd377.zip | |
use system function to recursive remove the directory used by temporary storage
| -rw-r--r-- | lib/private/files/storage/temporary.php | 4 | ||||
| -rw-r--r-- | tests/lib/files/view.php | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/files/storage/temporary.php b/lib/private/files/storage/temporary.php index d84dbda2e39..7547640f175 100644 --- a/lib/private/files/storage/temporary.php +++ b/lib/private/files/storage/temporary.php @@ -24,4 +24,8 @@ class Temporary extends Local{ parent::__destruct(); $this->cleanUp(); } + + public function getDataDir() { + return $this->datadir; + } } diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index b2e0b59d8e6..8eca55d1fdf 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -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() { |