summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2015-03-24 10:02:48 +0100
committerRobin Appelman <icewind@owncloud.com>2015-03-26 17:07:02 +0100
commit3ed6ed3c3674bfc60bcd2fc64edea1820f1be9d0 (patch)
treee451079d4bc4c276582d55f9666e8803ee2bb222 /lib/private
parent7ec8f12ad4f8d05f540c02145eab641f69f8dc04 (diff)
downloadnextcloud-server-3ed6ed3c3674bfc60bcd2fc64edea1820f1be9d0.tar.gz
nextcloud-server-3ed6ed3c3674bfc60bcd2fc64edea1820f1be9d0.zip
Force test cases using background commands to handle setting up the filesystem
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/command/fileaccess.php6
-rw-r--r--lib/private/command/queuebus.php2
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/command/fileaccess.php b/lib/private/command/fileaccess.php
index 5de00862fac..b08fb1825ea 100644
--- a/lib/private/command/fileaccess.php
+++ b/lib/private/command/fileaccess.php
@@ -11,8 +11,12 @@ namespace OC\Command;
use OCP\IUser;
trait FileAccess {
- protected function getUserFolder(IUser $user) {
+ protected function setupFS(IUser $user){
\OC_Util::setupFS($user->getUID());
+ }
+
+ protected function getUserFolder(IUser $user) {
+ $this->setupFS($user);
return \OC::$server->getUserFolder($user->getUID());
}
}
diff --git a/lib/private/command/queuebus.php b/lib/private/command/queuebus.php
index 29c769e0107..953479086ca 100644
--- a/lib/private/command/queuebus.php
+++ b/lib/private/command/queuebus.php
@@ -15,7 +15,7 @@ class QueueBus implements IBus {
/**
* @var (ICommand|callable)[]
*/
- private $queue;
+ private $queue = [];
/**
* Schedule a command to be fired