Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-10-29 14:47:06 +0400
committerBjoern Schiessle <schiessle@owncloud.com>2013-10-29 14:47:06 +0400
commitb6249ea37740dcfd1435d79b07796f3ace7bca86 (patch)
treed1d14766689dd435caca1e60d65ea8061fcabbd9 /tests
parent392ed5c8813e0d69f880a055e5a5e7050d8b1354 (diff)
disable encryption app for file cache updater test since the test doesn't use a completely initialized oc filesystem
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/files/cache/updater.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php
index 34760769a75..03d061cc444 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -21,6 +21,8 @@ class Updater extends \PHPUnit_Framework_TestCase {
*/
private $scanner;
+ private $stateFilesEncryption;
+
/**
* @var \OC\Files\Cache\Cache $cache
*/
@@ -29,6 +31,12 @@ class Updater extends \PHPUnit_Framework_TestCase {
private static $user;
public function setUp() {
+
+ // remember files_encryption state
+ $this->stateFilesEncryption = \OC_App::isEnabled('files_encryption');
+ // we want to tests with the encryption app disabled
+ \OC_App::disable('files_encryption');
+
$this->storage = new \OC\Files\Storage\Temporary(array());
$textData = "dummy file data\n";
$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
@@ -69,6 +77,10 @@ class Updater extends \PHPUnit_Framework_TestCase {
}
\OC_User::deleteUser(self::$user);
Filesystem::tearDown();
+ // reset app files_encryption
+ if ($this->stateFilesEncryption) {
+ \OC_App::enable('files_encryption');
+ }
}
public function testWrite() {