From cea56df59ec4530d78e66fd341738d77e0ab1745 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 25 Apr 2013 16:56:48 +0200
Subject: [PATCH] Have the filecache updater testcase clean the filesystem
properly
---
lib/files/filesystem.php | 1 +
tests/lib/files/cache/updater.php | 9 +++------
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index c0e9d215fb..edd37d7b46 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 aaf932c97f..dad3cd7e65 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');
--
GitLab