diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-07-16 15:22:47 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-07-16 15:22:47 +0200 |
| commit | 0ae8eb4f5e05d9e3c5a22a7278ee104edd95fdf4 (patch) | |
| tree | 47d53cb6b0deb37aa31a41342c7c73f1f0805ba0 /tests/lib/cache | |
| parent | 5418c98a81caba2da00b2e81fb56fe373737a7c8 (diff) | |
| parent | d673d8c25310f0ea73927b8b252e6823a11087f4 (diff) | |
| download | nextcloud-server-0ae8eb4f5e05d9e3c5a22a7278ee104edd95fdf4.tar.gz nextcloud-server-0ae8eb4f5e05d9e3c5a22a7278ee104edd95fdf4.zip | |
Merge branch 'master' into cache
Diffstat (limited to 'tests/lib/cache')
| -rw-r--r-- | tests/lib/cache/file.php | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index 5dcd3268804..038cb21b257 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()); } @@ -31,15 +32,20 @@ class Test_Cache_File extends Test_Cache { //clear all proxies and hooks so we can do clean testing OC_FileProxy::clearProxies(); OC_Hook::clear('OC_Filesystem'); - + + //disabled atm //enable only the encryption hook if needed - if(OC_App::isEnabled('files_encryption')) { - OC_FileProxy::register(new OC_FileProxy_Encryption()); - } - + //if(OC_App::isEnabled('files_encryption')) { + // OC_FileProxy::register(new OC_FileProxy_Encryption()); + //} + //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()); @@ -59,5 +65,6 @@ class Test_Cache_File extends Test_Cache { public function tearDown() { OC_User::setUserId($this->user); + OC_Config::setValue('datadirectory', $this->datadir); } } |