diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-02-09 13:17:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-09 13:17:54 +0100 |
| commit | ed4633a5523b14271e1bef9f484bfc0ab4dccde4 (patch) | |
| tree | ea0aa4f5560475ec7daf634d179e6f9667544ccb | |
| parent | 51f0555b5c9b888652692ba67085f11e983f495a (diff) | |
| parent | 5e408aeb6c937980a508d07cce9ed43ff4147c20 (diff) | |
| download | nextcloud-server-ed4633a5523b14271e1bef9f484bfc0ab4dccde4.tar.gz nextcloud-server-ed4633a5523b14271e1bef9f484bfc0ab4dccde4.zip | |
Merge pull request #3408 from nextcloud/nullstorage-free-space
return unknown free space from nullstorage
| -rw-r--r-- | lib/private/Lockdown/Filesystem/NullStorage.php | 3 | ||||
| -rw-r--r-- | tests/lib/Lockdown/Filesystem/NullStorageTest.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/Lockdown/Filesystem/NullStorage.php b/lib/private/Lockdown/Filesystem/NullStorage.php index 967b6d2c6e7..ea911b90064 100644 --- a/lib/private/Lockdown/Filesystem/NullStorage.php +++ b/lib/private/Lockdown/Filesystem/NullStorage.php @@ -20,6 +20,7 @@ namespace OC\Lockdown\Filesystem; use Icewind\Streams\IteratorDirectory; +use OC\Files\FileInfo; use OC\Files\Storage\Common; class NullStorage extends Common { @@ -128,7 +129,7 @@ class NullStorage extends Common { } public function free_space($path) { - return 0; + return FileInfo::SPACE_UNKNOWN; } public function touch($path, $mtime = null) { diff --git a/tests/lib/Lockdown/Filesystem/NullStorageTest.php b/tests/lib/Lockdown/Filesystem/NullStorageTest.php index dc99eb4c03a..c6faf325cd4 100644 --- a/tests/lib/Lockdown/Filesystem/NullStorageTest.php +++ b/tests/lib/Lockdown/Filesystem/NullStorageTest.php @@ -27,6 +27,7 @@ use Icewind\Streams\IteratorDirectory; use OC\ForbiddenException; use OC\Lockdown\Filesystem\NullCache; use OC\Lockdown\Filesystem\NullStorage; +use OC\Files\FileInfo; use OCP\Files\Storage; use Test\TestCase; @@ -182,7 +183,7 @@ class NullStorageTest extends TestCase { } public function testFree_space() { - $this->assertSame(0, $this->storage->free_space('foo')); + $this->assertSame(FileInfo::SPACE_UNKNOWN, $this->storage->free_space('foo')); } public function testTouch() { |