diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-07-05 08:54:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-05 08:54:51 +0200 |
| commit | d2d99a91a0bb47ab4f2116692f363b90a736711b (patch) | |
| tree | a68250d1e2a7b2f25d2062504a741b8dbf0b1540 /lib | |
| parent | 34eec5726297d1720f5390a567609b07e2cbdd9f (diff) | |
| download | nextcloud-server-d2d99a91a0bb47ab4f2116692f363b90a736711b.tar.gz nextcloud-server-d2d99a91a0bb47ab4f2116692f363b90a736711b.zip | |
fix swift primary object store test (#25281)
* Wait for socket to be open
* Fix call on null
* Allow DB access for MountProviderTest
Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/View.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 31549c93cb2..7d9771e6394 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1980,7 +1980,7 @@ class View { $mount = $this->getMountForLock($absolutePath, $lockMountPoint); if ($mount) { $storage = $mount->getStorage(); - if ($storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { + if ($storage && $storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { $storage->releaseLock( $mount->getInternalPath($absolutePath), $type, |