diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-07-07 13:56:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-07 13:56:12 +0300 |
| commit | cfd4e79881ce70c06773e3a6659a98ed0df64aec (patch) | |
| tree | 606c7fa28553d828dcf89f4f3e3b89226b7b58a8 /lib | |
| parent | 24ac177f8355f1769ecc1961edeff0144ea830fa (diff) | |
fix swift primary object store test (#25281) (#25391)
* 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 bf49ea2148d..0bc9ad211a8 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -1959,7 +1959,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, |