summaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-07-20 17:57:18 +0200
committerRobin Appelman <icewind@owncloud.com>2012-07-20 17:58:05 +0200
commit0e6238c66fc5f37b11800e632dbcccd72833628f (patch)
tree875df2cb7e544909a2130ed22a36d9237a10ece0 /tests/lib
parent48306a3c4f708b80143757acbe9b270be476aab4 (diff)
downloadnextcloud-server-0e6238c66fc5f37b11800e632dbcccd72833628f.tar.gz
nextcloud-server-0e6238c66fc5f37b11800e632dbcccd72833628f.zip
fix OC_Cache_File tests if encryption is not enabled
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/cache/file.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 54e60e6569d..c33c513fcff 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -30,8 +30,10 @@ class Test_Cache_File extends Test_Cache {
OC_FileProxy::clearProxies();
OC_Hook::clear('OC_Filesystem');
- //enable only the encryption hook
- OC_FileProxy::register(new OC_FileProxy_Encryption());
+ //enable only the encryption hook if needed
+ if(OC_App::isEnabled('files_encryption')){
+ OC_FileProxy::register(new OC_FileProxy_Encryption());
+ }
//set up temporary storage
OC_Filesystem::clearMounts();