summaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-05-12 11:33:54 -0500
committerGitHub <noreply@github.com>2017-05-12 11:33:54 -0500
commit3bf950307045c5d108d4f37aa2c4748d4127c8e2 (patch)
treea867262a3e6edc16dde6f64fee841eb11f07f576 /tests/lib
parent2289ccd0ec72c54772c77f143886e84363099885 (diff)
parent51c55a867d78e3d6518d38ab2d5d15f1f2eb65cc (diff)
downloadnextcloud-server-3bf950307045c5d108d4f37aa2c4748d4127c8e2.tar.gz
nextcloud-server-3bf950307045c5d108d4f37aa2c4748d4127c8e2.zip
Merge pull request #4816 from nextcloud/Ardinis-quota-files_external
Correctly calculate used space for quota with external storage
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/HelperStorageTest.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/lib/HelperStorageTest.php b/tests/lib/HelperStorageTest.php
index e27d5eca21d..d42c43c5ab8 100644
--- a/tests/lib/HelperStorageTest.php
+++ b/tests/lib/HelperStorageTest.php
@@ -158,9 +158,9 @@ class HelperStorageTest extends \Test\TestCase {
$config->setSystemValue('quota_include_external_storage', 'true');
$storageInfo = \OC_Helper::getStorageInfo('');
- $this->assertEquals(12, $storageInfo['free']);
- $this->assertEquals(5, $storageInfo['used']);
- $this->assertEquals(17, $storageInfo['total']);
+ $this->assertEquals(12, $storageInfo['free'], '12 bytes free in home storage');
+ $this->assertEquals(22, $storageInfo['used'], '5 bytes of home storage and 17 bytes of the temporary storage are used');
+ $this->assertEquals(34, $storageInfo['total'], '5 bytes used and 12 bytes free in home storage as well as 17 bytes used in temporary storage');
$config->setSystemValue('quota_include_external_storage', $oldConfig);
}