Merge pull request #3132 from owncloud/mount-setupfs

Make sure the filesystem is initialized when searching for mounts

3 files changed, 7 insertions, 6 deletions

diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 8c8e80c1be4..09732e67ac6 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -311,6 +311,7 @@ class Filesystem {
 	 */
 	static public function tearDown() {
 		self::clearMounts();
+		self::$defaultInstance = null;
 	}
 
 	/**
diff --git a/lib/files/mount.php b/lib/files/mount.php
index 59c98e9dcc8..0030d0ee7a6 100644
--- a/lib/files/mount.php
+++ b/lib/files/mount.php
@@ -136,6 +136,7 @@ class Mount {
 	 * @return Mount
 	 */
 	public static function find($path) {
+		\OC_Util::setupFS();
 		$path = self::formatPath($path);
 		if (isset(self::$mounts[$path])) {
 			return self::$mounts[$path];
@@ -163,6 +164,7 @@ class Mount {
 	 * @return Mount[]
 	 */
 	public static function findIn($path) {
+		\OC_Util::setupFS();
 		$path = self::formatPath($path);
 		$result = array();
 		$pathLength = strlen($path);
@@ -186,6 +188,7 @@ class Mount {
 	 * @return Mount[]
 	 */
 	public static function findByStorageId($id) {
+		\OC_Util::setupFS();
 		if (strlen($id) > 64) {
 			$id = md5($id);
 		}
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php
index aaf932c97fe..dad3cd7e650 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -42,14 +42,11 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$this->scanner->scan('');
 		$this->cache = $this->storage->getCache();
 
+		\OC\Files\Filesystem::tearDown();
 		if (!self::$user) {
-			if (!\OC\Files\Filesystem::getView()) {
-				self::$user = uniqid();
-				\OC\Files\Filesystem::init(self::$user, '/' . self::$user . '/files');
-			} else {
-				self::$user = \OC_User::getUser();
-			}
+			self::$user = uniqid();
 		}
+		\OC\Files\Filesystem::init(self::$user, '/' . self::$user . '/files');
 
 		Filesystem::clearMounts();
 		Filesystem::mount($this->storage, array(), '/' . self::$user . '/files');