From ad4ec414c9e1cf4ff8189040a132ec81bf1fd377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 5 Jun 2014 21:00:50 +0200
Subject: [PATCH] use system function to recursive remove the directory used by
temporary storage
---
lib/private/files/storage/temporary.php | 4 ++++
tests/lib/files/view.php | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/private/files/storage/temporary.php b/lib/private/files/storage/temporary.php
index d84dbda2e3..7547640f17 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 b2e0b59d8e..8eca55d1fd 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() {
--
GitLab