summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/tests
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-07-22 11:39:27 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-07-22 11:39:27 +0200
commit6e2418141d7ef6a9b09f5a414aba52d0d5241efe (patch)
tree2677f11270d0f028b82fed2fc5cd6772609852f6 /apps/files_encryption/tests
parent20ee9945d18b9a8124e84f2dcbb82b75011f27ec (diff)
parent342a54bf7b31fe21362bac59cfa80a5d30ce9362 (diff)
downloadnextcloud-server-6e2418141d7ef6a9b09f5a414aba52d0d5241efe.tar.gz
nextcloud-server-6e2418141d7ef6a9b09f5a414aba52d0d5241efe.zip
Merge branch 'master' into parallel-autotest.sh-master
Diffstat (limited to 'apps/files_encryption/tests')
-rwxr-xr-xapps/files_encryption/tests/share.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 6b530315859..ebf678da78e 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -751,6 +751,9 @@ 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);