diff options
| author | Clark Tomlinson <fallen013@gmail.com> | 2014-09-22 13:38:46 -0400 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-19 11:07:55 +0100 |
| commit | 2f1270278dd4a33ae1d3985774ea864302937898 (patch) | |
| tree | 679bba2c3c2e8240fc5146a73c1a2b8c30284265 | |
| parent | d49e3d0ceb3785bc5a45bf9a909b32934863dc6d (diff) | |
| download | nextcloud-server-2f1270278dd4a33ae1d3985774ea864302937898.tar.gz nextcloud-server-2f1270278dd4a33ae1d3985774ea864302937898.zip | |
fixing cache routes
Conflicts:
tests/lib/cache/file.php
tests/lib/cache/usercache.php
| -rw-r--r-- | tests/lib/cache/file.php | 6 | ||||
| -rw-r--r-- | 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 77331a6c9f0..8cc45c85405 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 89beaabe76a..8a23a805ebe 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(); |