diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-30 22:10:04 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 13:30:28 +0200 |
| commit | 00338f9dca97fd7b48d96201fd607cf460c385ff (patch) | |
| tree | f88bfad7483e6b7432fdf4a2af5907efead59954 /apps/files_sharing/tests | |
| parent | 99255ff3a92b2d242f3c723979341951a303f83d (diff) | |
| download | nextcloud-server-00338f9dca97fd7b48d96201fd607cf460c385ff.tar.gz nextcloud-server-00338f9dca97fd7b48d96201fd607cf460c385ff.zip | |
Removing files_encryption left overs
Diffstat (limited to 'apps/files_sharing/tests')
| -rw-r--r-- | apps/files_sharing/tests/testcase.php | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php index 6a831bf5f62..bef727edac7 100644 --- a/apps/files_sharing/tests/testcase.php +++ b/apps/files_sharing/tests/testcase.php @@ -45,7 +45,6 @@ abstract class TestCase extends \Test\TestCase { const TEST_FILES_SHARING_API_GROUP1 = "test-share-group1"; - public static $stateFilesEncryption; public $filename; public $data; /** @@ -58,12 +57,6 @@ abstract class TestCase extends \Test\TestCase { public static function setUpBeforeClass() { parent::setUpBeforeClass(); - // remember files_encryption state - self::$stateFilesEncryption = \OC_App::isEnabled('files_encryption'); - - //we don't want to tests with app files_encryption enabled - \OC_App::disable('files_encryption'); - // reset backend \OC_User::clearBackends(); \OC_Group::clearBackends(); @@ -100,8 +93,6 @@ abstract class TestCase extends \Test\TestCase { $this->data = 'foobar'; $this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files'); - - $this->assertFalse(\OC_App::isEnabled('files_encryption')); } protected function tearDown() { @@ -120,13 +111,6 @@ abstract class TestCase extends \Test\TestCase { // delete group \OC_Group::deleteGroup(self::TEST_FILES_SHARING_API_GROUP1); - // reset app files_encryption - if (self::$stateFilesEncryption) { - \OC_App::enable('files_encryption'); - } else { - \OC_App::disable('files_encryption'); - } - \OC_Util::tearDownFS(); \OC_User::setUserId(''); Filesystem::tearDown(); |