From 61dadb05a6935db54e00e95be655255ccf2bb8ec Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 26 Apr 2013 22:14:38 +0200 Subject: [PATCH] Cache Test: set datadir to temporary location, otherwise initmountpoints will access to productive location --- tests/lib/cache/file.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index 7da5a8b85c..038cb21b25 100644 --- a/tests/lib/cache/file.php +++ b/tests/lib/cache/file.php @@ -22,7 +22,8 @@ class Test_Cache_File extends Test_Cache { private $user; - + private $datadir; + function skip() { //$this->skipUnless(OC_User::isLoggedIn()); } @@ -40,7 +41,11 @@ class Test_Cache_File extends Test_Cache { //set up temporary storage \OC\Files\Filesystem::clearMounts(); - \OC\Files\Filesystem::mount('\OC\Files\Storage\Temporary',array(),'/'); + $storage = new \OC\Files\Storage\Temporary(array()); + \OC\Files\Filesystem::mount($storage,array(),'/'); + $datadir = str_replace('local::', '', $storage->getId()); + $this->datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data'); + OC_Config::setValue('datadirectory', $datadir); OC_User::clearBackends(); OC_User::useBackend(new OC_User_Dummy()); @@ -60,5 +65,6 @@ class Test_Cache_File extends Test_Cache { public function tearDown() { OC_User::setUserId($this->user); + OC_Config::setValue('datadirectory', $this->datadir); } }