From 724f88d9ff1e03e9d857c331961d98da62f31b5e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 11 May 2015 16:50:43 +0200
Subject: [PATCH] fix tests

---
 apps/files_trashbin/tests/trashbin.php     | 1 +
 apps/files_versions/tests/versions.php     | 1 +
 tests/core/avatar/avatarcontrollertest.php | 6 +-----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index 85c47b527b..0c37af24de 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -646,6 +646,7 @@ class Test_Trashbin extends \Test\TestCase {
 		\OC\Files\Filesystem::tearDown();
 		\OC_User::setUserId($user);
 		\OC_Util::setupFS($user);
+		\OC::$server->getUserFolder($user);
 	}
 }
 
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 97afcf715c..685bf48d65 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -753,6 +753,7 @@ class Test_Files_Versioning extends \Test\TestCase {
 		\OC\Files\Filesystem::tearDown();
 		\OC_User::setUserId($user);
 		\OC_Util::setupFS($user);
+		\OC::$server->getUserFolder($user);
 	}
 
 }
diff --git a/tests/core/avatar/avatarcontrollertest.php b/tests/core/avatar/avatarcontrollertest.php
index a5456eb678..c58d7febc3 100644
--- a/tests/core/avatar/avatarcontrollertest.php
+++ b/tests/core/avatar/avatarcontrollertest.php
@@ -88,11 +88,7 @@ class AvatarControllerTest extends \Test\TestCase {
 		$this->user = $this->getUniqueID('user');
 
 		OC::$server->getUserManager()->createUser($this->user, $this->user);
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		Filesystem::tearDown();
-		\OC_User::setUserId($this->user);
-		\OC_Util::setupFS($this->user);
+		$this->loginAsUser($this->user);
 
 		// Create Cache dir
 		$view = new \OC\Files\View('/'.$this->user);