[Pkg-owncloud-commits] [owncloud] 224/457: always use locking in unit tests

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 72847dbc7794f250fb59ddf5e679d226909ec065
Author: Robin Appelman <icewind at owncloud.com>
Date:   Fri May 22 13:52:42 2015 +0200

    always use locking in unit tests
---
 lib/private/server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/server.php b/lib/private/server.php
index 88f57e7..551012d 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -423,7 +423,7 @@ class Server extends SimpleContainer implements IServerContainer {
 			);
 		});
 		$this->registerService('LockingProvider', function (Server $c) {
-			if ($c->getConfig()->getSystemValue('filelocking.enabled', false)) {
+			if ($c->getConfig()->getSystemValue('filelocking.enabled', false) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
 				/** @var \OC\Memcache\Factory $memcacheFactory */
 				$memcacheFactory = $c->getMemCacheFactory();
 				$memcache = $memcacheFactory->createDistributed('lock');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git