From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 25 Apr 2013 14:56:48 +0000 (+0200)
Subject: Have the filecache updater testcase clean the filesystem properly
X-Git-Tag: v6.0.0alpha2~851^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cea56df59ec4530d78e66fd341738d77e0ab1745;p=nextcloud-server.git

Have the filecache updater testcase clean the filesystem properly
---

diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index c0e9d215fb5..edd37d7b468 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/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');