summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-11-14 14:38:13 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-11-14 14:38:13 +0100
commit0f3c5d8541dcb41eebd00f22864a0a646c11124f (patch)
treeb64cdac16d9a44bc051ec74becaab11a60377df6
parent9fa25d5542aed56e3851aef99dbb38371fe865e8 (diff)
parent3fa892aecce983ca31d5e43caa2c380b13980f49 (diff)
downloadnextcloud-server-0f3c5d8541dcb41eebd00f22864a0a646c11124f.tar.gz
nextcloud-server-0f3c5d8541dcb41eebd00f22864a0a646c11124f.zip
Merge pull request #12181 from owncloud/resubmit-second-fail
Fail...
-rw-r--r--tests/settings/controller/mailsettingscontrollertest.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/settings/controller/mailsettingscontrollertest.php
index b4177613f38..6d3485d28e4 100644
--- a/tests/settings/controller/mailsettingscontrollertest.php
+++ b/tests/settings/controller/mailsettingscontrollertest.php
@@ -151,7 +151,7 @@ class MailSettingscontrollerTest extends \PHPUnit_Framework_TestCase {
* FIXME: Disabled due to missing DI on mail class.
* TODO: Re-enable when https://github.com/owncloud/core/pull/12085 is merged.
*/
- $this->markSkipped();
+ $this->markTestSkipped('Disable test until OC_Mail is rewritten.');
$user = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()