diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-26 01:48:37 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-26 01:48:37 -0800 |
| commit | adc986f3e4b83670f69e2ce48044595193be4e69 (patch) | |
| tree | 5180b04fd22e0f1735e287e044f737bfb2748abe /apps/files_sharing | |
| parent | 8a4fddeb4afef2e96cadd505600700202fc0ee9b (diff) | |
| parent | fe8df31fa5cb075b4a07108cb7b30bc515d1bb46 (diff) | |
| download | nextcloud-server-adc986f3e4b83670f69e2ce48044595193be4e69.tar.gz nextcloud-server-adc986f3e4b83670f69e2ce48044595193be4e69.zip | |
Merge pull request #14502 from owncloud/failing-mysql-master-tests
Failing mysql master tests
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/tests/controller/sharecontroller.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/tests/testcase.php | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php index 95f5abcc9bd..da628b03757 100644 --- a/apps/files_sharing/tests/controller/sharecontroller.php +++ b/apps/files_sharing/tests/controller/sharecontroller.php @@ -36,7 +36,7 @@ use OC\URLGenerator; /** * @package OCA\Files_Sharing\Controllers */ -class ShareControllerTest extends \PHPUnit_Framework_TestCase { +class ShareControllerTest extends \Test\TestCase { /** @var IAppContainer */ private $container; diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php index cbf324df55d..3c4b5870efa 100644 --- a/apps/files_sharing/tests/testcase.php +++ b/apps/files_sharing/tests/testcase.php @@ -65,7 +65,7 @@ abstract class TestCase extends \Test\TestCase { // reset backend \OC_User::clearBackends(); - \OC_User::useBackend('database'); + \OC_Group::clearBackends(); // clear share hooks \OC_Hook::clear('OCP\\Share'); @@ -130,6 +130,12 @@ abstract class TestCase extends \Test\TestCase { \OC_User::setUserId(''); Filesystem::tearDown(); + // reset backend + \OC_User::clearBackends(); + \OC_User::useBackend('database'); + \OC_Group::clearBackends(); + \OC_Group::useBackend(new \OC_Group_Database()); + parent::tearDownAfterClass(); } |