Merge pull request #16075 from owncloud/skeleton-copy-delay

wait with copying the skeleton untill login and setupfs are done

2 files changed, 4 insertions, 5 deletions

diff --git a/tests/core/avatar/avatarcontrollertest.php b/tests/core/avatar/avatarcontrollertest.php
index a5456eb6789..c58d7febc3f 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);
diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index 76d5662da9d..c1ebfb025cf 100644
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -174,6 +174,9 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		\OC\Files\Filesystem::tearDown();
 		\OC_User::setUserId($user);
 		\OC_Util::setupFS($user);
+		if (\OC_User::userExists($user)) {
+			\OC::$server->getUserFolder($user);
+		}
 	}
 
 	/**