diff options
| author | Robin Appelman <icewind@owncloud.com> | 2015-05-22 13:52:42 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2015-06-01 13:22:56 +0200 |
| commit | 72847dbc7794f250fb59ddf5e679d226909ec065 (patch) | |
| tree | 5dec47df2bac77599106957ab013dc538f7fc677 | |
| parent | 437c0b55a625ce3c2c6a81740fda8cb7a0bf1998 (diff) | |
| download | nextcloud-server-72847dbc7794f250fb59ddf5e679d226909ec065.tar.gz nextcloud-server-72847dbc7794f250fb59ddf5e679d226909ec065.zip | |
always use locking in unit tests
| -rw-r--r-- | lib/private/server.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index 88f57e73a39..551012d8355 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'); |