summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-12-04 17:43:38 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2013-12-04 17:43:38 +0100
commitb919a65432edf1536879b341e3e4d4bd002d2196 (patch)
treeb59948bb1b513fd1b8b89b1876f70cee44cda9c6 /apps/files_encryption
parent737b9a990f73ffe362cbe03b2878f8a633414336 (diff)
downloadnextcloud-server-b919a65432edf1536879b341e3e4d4bd002d2196.tar.gz
nextcloud-server-b919a65432edf1536879b341e3e4d4bd002d2196.zip
enable more tests
Diffstat (limited to 'apps/files_encryption')
-rwxr-xr-xapps/files_encryption/tests/share.php12
1 files changed, 4 insertions, 8 deletions
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 6a29d2428dc..1d852d3c8cc 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -649,9 +649,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
* @large
*/
function testRecoveryFile() {
- $this->markTestIncomplete(
- 'No idea what\'s wrong here, this works perfectly in real-world. removeRecoveryKeys(\'/\') L709 removes correctly the keys, but for some reasons afterwards also the top-level folder "share-keys" is gone...'
- );
+
// login as admin
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -754,9 +752,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
* @large
*/
function testRecoveryForUser() {
- $this->markTestIncomplete(
- 'This test drives Jenkins crazy - "Cannot modify header information - headers already sent" - line 811'
- );
+
// login as admin
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -889,8 +885,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
} catch (Exception $e) {
$this->assertEquals(0, strpos($e->getMessage(), "Following users are not set up for encryption"));
}
-
-
+
+
// login as admin
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);