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_trashbin/tests | |
| parent | 99255ff3a92b2d242f3c723979341951a303f83d (diff) | |
| download | nextcloud-server-00338f9dca97fd7b48d96201fd607cf460c385ff.tar.gz nextcloud-server-00338f9dca97fd7b48d96201fd607cf460c385ff.zip | |
Removing files_encryption left overs
Diffstat (limited to 'apps/files_trashbin/tests')
| -rw-r--r-- | apps/files_trashbin/tests/trashbin.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php index b3176ebbe92..c98de79cbd0 100644 --- a/apps/files_trashbin/tests/trashbin.php +++ b/apps/files_trashbin/tests/trashbin.php @@ -36,7 +36,6 @@ class Test_Trashbin extends \Test\TestCase { private $trashRoot1; private $trashRoot2; - private static $encryptionStatus; private static $rememberRetentionObligation; private static $rememberAutoExpire; @@ -58,7 +57,6 @@ class Test_Trashbin extends \Test\TestCase { \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup'); //disable encryption - self::$encryptionStatus = \OC_App::isEnabled('files_encryption'); \OC_App::disable('files_encryption'); //configure trashbin @@ -82,10 +80,6 @@ class Test_Trashbin extends \Test\TestCase { // cleanup test user \OC_User::deleteUser(self::TEST_TRASHBIN_USER1); - if (self::$encryptionStatus === true) { - \OC_App::enable('files_encryption'); - } - \OC_Config::setValue('trashbin_retention_obligation', self::$rememberRetentionObligation); \OC_Config::setValue('trashbin_auto_expire', self::$rememberAutoExpire); |