Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change free space calculation #22528

Merged
merged 2 commits into from
Sep 3, 2020
Merged

Change free space calculation #22528

merged 2 commits into from
Sep 3, 2020

Conversation

kesselb
Copy link
Contributor

@kesselb kesselb commented Aug 31, 2020

Close #22475

If neither $userTrashbinSize nor $systemTrashbinSize are defined we have: $configuredTrashbinSize = (-1 < 0) ? -1 : -1;, (bool)-1 is true and the freespace is always-1 - $trashbinSize.

That should work but no idea how it should be ;)

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb kesselb added bug 3. to review Waiting for reviews labels Aug 31, 2020
@kesselb kesselb added this to the Nextcloud 20 milestone Aug 31, 2020
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

@rullzer rullzer mentioned this pull request Sep 1, 2020
21 tasks
@kesselb
Copy link
Contributor Author

kesselb commented Sep 1, 2020

Are the trashbin tests failing on master too?

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@faily-bot
Copy link

faily-bot bot commented Sep 1, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 32529: failure

mysql8.0-php7.2

Show full log
There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There were 2 failures:

1) Test\Files\ObjectStore\ObjectStoreStorageTest::testCopyOverWriteDirectoryOverFile
Failed asserting that false matches expected 'foo'.

/drone/src/tests/lib/Files/Storage/Storage.php:582

2) OCA\Files_Sharing\Tests\SharedMountTest::testPermissionMovedGroupShare with data set #74 ('folder', 17, 5)
Failed asserting that false is true.

/drone/src/apps/files_sharing/tests/SharedMountTest.php:367

if ($key === 'filesystem_check_changes') {
return \OC\Files\Cache\Watcher::CHECK_ONCE;
} else {
return $config->getSystemValue($key, $default);
}
});
$mockConfig
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mockageddon 🙈

@rullzer rullzer merged commit 39cc193 into master Sep 3, 2020
@rullzer rullzer deleted the bug/22475/trash-bin-size branch September 3, 2020 07:28
@rullzer
Copy link
Member

rullzer commented Sep 3, 2020

/backport to stable19

@rullzer
Copy link
Member

rullzer commented Sep 3, 2020

/backport to stable18

@rullzer
Copy link
Member

rullzer commented Sep 3, 2020

/backport to stable17

@backportbot-nextcloud
Copy link

The backport to stable17 failed. Please do this backport manually.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Trash get fully emptied when Cron runs (v18.0.8 and v19.0.2)
5 participants