Skip to content

Change free space calculation - #22528

Merged
rullzer merged 2 commits into
masterfrom
bug/22475/trash-bin-size
Sep 3, 2020
Merged

Change free space calculation#22528
rullzer merged 2 commits into
masterfrom
bug/22475/trash-bin-size

Conversation

@kesselb

Copy link
Copy Markdown
Contributor

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>
@kesselbkesselb added bug 3. to review Waiting for reviews labels Aug 31, 2020
@kesselbkesselb added this to the Nextcloud 20 milestone Aug 31, 2020

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Good catch

@rullzerrullzer mentioned this pull request Sep 1, 2020
21 tasks
@kesselb

Copy link
Copy Markdown
ContributorAuthor

Are the trashbin tests failing on master too?

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
kesselbforce-pushed the bug/22475/trash-bin-size branch from 3552878 to ac8051eCompareSeptember 1, 2020 09:39
@faily-bot

faily-botBot commented Sep 1, 2020

Copy link
Copy Markdown

🤖 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

return $config->getSystemValue($key, $default);
}
});
$mockConfig

Copy link
Copy Markdown
ContributorAuthor

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 masterSep 3, 2020
@rullzer
rullzer deleted the bug/22475/trash-bin-size branch September 3, 2020 07:28
@rullzer

Copy link
Copy Markdown
Member

/backport to stable19

@rullzer

Copy link
Copy Markdown
Member

/backport to stable18

@rullzer

Copy link
Copy Markdown
Member

/backport to stable17

@backportbot-nextcloud

Copy link
Copy Markdown

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

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbug

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

@kesselb@rullzer@go2sh@icewind1991@ChristophWurst