mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedshares2 

Fix master unit test: Clear leftover shares from other tests
This commit is contained in:
Morris Jobke 2015-04-10 15:42:16 +02:00
parent a163243e31 4a225aa12c
commit 20a1a110de
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_sharing/tests/deleteorphanedsharesjobtest.php
View File

@ -70,6 +70,8 @@ class DeleteOrphanedSharesJobTest extends \Test\TestCase {
parent::setUp();
$this->connection = \OC::$server->getDatabaseConnection();
// clear occasional leftover shares from other tests
$this->connection->executeUpdate('DELETE FROM `*PREFIX*share`');
$this->user1 = $this->getUniqueID('user1_');
$this->user2 = $this->getUniqueID('user2_');
@ -84,7 +86,7 @@ class DeleteOrphanedSharesJobTest extends \Test\TestCase {
}
protected function tearDown() {
$this->connection->executeUpdate('DELETE FROM `*PREFIX*share` WHERE `item_type` in (\'file\', \'folder\')');
$this->connection->executeUpdate('DELETE FROM `*PREFIX*share`');
$userManager = \OC::$server->getUserManager();
$user1 = $userManager->get($this->user1);