[Pkg-owncloud-commits] [owncloud] 39/74: fixing cache routes

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 2f1270278dd4a33ae1d3985774ea864302937898
Author: Clark Tomlinson <fallen013 at gmail.com>
Date:   Mon Sep 22 13:38:46 2014 -0400

    fixing cache routes
    
    Conflicts:
    	tests/lib/cache/file.php
    	tests/lib/cache/usercache.php
---
 tests/lib/cache/file.php      | 6 +++---
 tests/lib/cache/usercache.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 77331a6..8cc45c8 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -51,8 +51,8 @@ class FileCache extends \Test_Cache {
 		$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);
+		$this->datadir = \OC_Config::getValue('cachedirectory', \OC::$SERVERROOT.'/data/cache');
+		\OC_Config::setValue('cachedirectory', $datadir);
 
 		\OC_User::clearBackends();
 		\OC_User::useBackend(new \OC_User_Dummy());
@@ -72,7 +72,7 @@ class FileCache extends \Test_Cache {
 
 	public function tearDown() {
 		\OC_User::setUserId($this->user);
-		\OC_Config::setValue('datadirectory', $this->datadir);
+		\OC_Config::setValue('cachedirectory', $this->datadir);
 
 		// Restore the original mount point
 		\OC\Files\Filesystem::clearMounts();
diff --git a/tests/lib/cache/usercache.php b/tests/lib/cache/usercache.php
index 89beaab..8a23a80 100644
--- a/tests/lib/cache/usercache.php
+++ b/tests/lib/cache/usercache.php
@@ -47,8 +47,8 @@ class UserCache extends \Test_Cache {
 		$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);
+		$this->datadir = \OC_Config::getValue('cachedirectory', \OC::$SERVERROOT.'/data/cache');
+		\OC_Config::setValue('cachedirectory', $datadir);
 
 		\OC_User::clearBackends();
 		\OC_User::useBackend(new \OC_User_Dummy());
@@ -68,7 +68,7 @@ class UserCache extends \Test_Cache {
 
 	public function tearDown() {
 		\OC_User::setUserId($this->user);
-		\OC_Config::setValue('datadirectory', $this->datadir);
+		\OC_Config::setValue('cachedirectory', $this->datadir);
 
 		// Restore the original mount point
 		\OC\Files\Filesystem::clearMounts();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git