fixing cache routes
This commit is contained in:
parent
db72270acc
commit
7b6aa3cd3d
|
@ -46,8 +46,8 @@ class FileCache extends \Test_Cache {
|
||||||
$storage = new \OC\Files\Storage\Temporary(array());
|
$storage = new \OC\Files\Storage\Temporary(array());
|
||||||
\OC\Files\Filesystem::mount($storage,array(),'/');
|
\OC\Files\Filesystem::mount($storage,array(),'/');
|
||||||
$datadir = str_replace('local::', '', $storage->getId());
|
$datadir = str_replace('local::', '', $storage->getId());
|
||||||
$this->datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data');
|
$this->datadir = \OC_Config::getValue('cachedirectory', \OC::$SERVERROOT.'/data/cache');
|
||||||
\OC_Config::setValue('datadirectory', $datadir);
|
\OC_Config::setValue('cachedirectory', $datadir);
|
||||||
|
|
||||||
\OC_User::clearBackends();
|
\OC_User::clearBackends();
|
||||||
\OC_User::useBackend(new \OC_User_Dummy());
|
\OC_User::useBackend(new \OC_User_Dummy());
|
||||||
|
@ -67,6 +67,6 @@ class FileCache extends \Test_Cache {
|
||||||
|
|
||||||
public function tearDown() {
|
public function tearDown() {
|
||||||
\OC_User::setUserId($this->user);
|
\OC_User::setUserId($this->user);
|
||||||
\OC_Config::setValue('datadirectory', $this->datadir);
|
\OC_Config::setValue('cachedirectory', $this->datadir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,8 +42,8 @@ class UserCache extends \Test_Cache {
|
||||||
$storage = new \OC\Files\Storage\Temporary(array());
|
$storage = new \OC\Files\Storage\Temporary(array());
|
||||||
\OC\Files\Filesystem::mount($storage,array(),'/');
|
\OC\Files\Filesystem::mount($storage,array(),'/');
|
||||||
$datadir = str_replace('local::', '', $storage->getId());
|
$datadir = str_replace('local::', '', $storage->getId());
|
||||||
$this->datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data');
|
$this->datadir = \OC_Config::getValue('cachedirectory', \OC::$SERVERROOT.'/data/cache');
|
||||||
\OC_Config::setValue('datadirectory', $datadir);
|
\OC_Config::setValue('cachedirectory', $datadir);
|
||||||
|
|
||||||
\OC_User::clearBackends();
|
\OC_User::clearBackends();
|
||||||
\OC_User::useBackend(new \OC_User_Dummy());
|
\OC_User::useBackend(new \OC_User_Dummy());
|
||||||
|
@ -63,6 +63,5 @@ class UserCache extends \Test_Cache {
|
||||||
|
|
||||||
public function tearDown() {
|
public function tearDown() {
|
||||||
\OC_User::setUserId($this->user);
|
\OC_User::setUserId($this->user);
|
||||||
\OC_Config::setValue('datadirectory', $this->datadir);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,8 @@ class LargeFileHelperGetFileSize extends \PHPUnit_Framework_TestCase {
|
||||||
|
|
||||||
public function setUp() {
|
public function setUp() {
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->filename = __DIR__ . '/../data/data.tar.gz';
|
$ds = DIRECTORY_SEPARATOR;
|
||||||
|
$this->filename = dirname(__DIR__) . "{$ds}data{$ds}data.tar.gz";
|
||||||
$this->fileSize = 4195;
|
$this->fileSize = 4195;
|
||||||
$this->helper = new \OC\LargeFileHelper;
|
$this->helper = new \OC\LargeFileHelper;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue