[Pkg-owncloud-commits] [owncloud] 92/215: adjust test

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 19486837b2bc135a8f083ff97d477eb5d6314d42
Author: Robin Appelman <icewind at owncloud.com>
Date:   Fri Mar 27 14:57:56 2015 +0100

    adjust test
---
 apps/files_sharing/tests/cache.php         | 4 +++-
 apps/files_sharing/tests/sharedstorage.php | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index 882c8af..7e7e5ee 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -113,7 +113,9 @@ class Test_Files_Sharing_Cache extends TestCase {
 	}
 
 	protected function tearDown() {
-		$this->sharedCache->clear();
+		if($this->sharedCache) {
+			$this->sharedCache->clear();
+		}
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index a1469a7..7c28d04 100644
--- a/apps/files_sharing/tests/sharedstorage.php
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -368,7 +368,10 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
 		$this->assertTrue($rootView->file_exists('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/' . $this->folder));
-		OC_Hook::emit('OC_Filesystem', 'setup', array('user' => self::TEST_FILES_SHARING_API_USER3, 'user_dir' => \OC_User::getHome(self::TEST_FILES_SHARING_API_USER3)));
+
+		$mountConfigManager = \OC::$server->getMountProviderCollection();
+		$mounts = $mountConfigManager->getMountsForUser(\OC::$server->getUserManager()->get(self::TEST_FILES_SHARING_API_USER3));
+		array_walk($mounts, array(\OC\Files\Filesystem::getMountManager(), 'addMount'));
 
 		$this->assertTrue($rootView->file_exists('/' . self::TEST_FILES_SHARING_API_USER3 . '/files/' . $this->filename));
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git