summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2014-08-29 14:36:00 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2014-10-16 14:10:15 +0200
commit92d069ab6cf5ee087fe84439736defdea490abab (patch)
tree80ac7fd70c427f5a93693decf9e8cd0304ebfb53 /apps/files_sharing
parenta045f8cd3aa203ad35bc4e3af0ddd76a38dbc38e (diff)
downloadnextcloud-server-92d069ab6cf5ee087fe84439736defdea490abab.tar.gz
nextcloud-server-92d069ab6cf5ee087fe84439736defdea490abab.zip
make skeleton compatible with objectstore
suspend encryption proxy when copying skeleton
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/tests/base.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php
index 738ba3493ba..84de6006fdb 100644
--- a/apps/files_sharing/tests/base.php
+++ b/apps/files_sharing/tests/base.php
@@ -126,9 +126,9 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
}
\OC_Util::tearDownFS();
- \OC_User::setUserId('');
+ \OC::$server->getUserSession()->setUser(null);
\OC\Files\Filesystem::tearDown();
- \OC_User::setUserId($user);
+ \OC::$server->getUserSession()->login($user, $password);
\OC_Util::setupFS($user);
}