Skip to content

[stable30] test: re-add object store primary storage phpunit tests #49802

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.

Sign up for GitHub

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

Merged
AndyScherzinger merged 5 commits into from
Feb 13, 2025
Merged

[stable30] test: re-add object store primary storage phpunit tests #49802

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9fd7dfd
fix: ensure source folder is removed from cache when moving to object…
icewind1991 Sep 20, 2024
e85d5df
fix: preserve fileid when moving from objectstore to non-objectstore
icewind1991 Sep 25, 2024
5a772da
test: fix share storage move test with object store
icewind1991 Sep 25, 2024
da33473
fix: rework move into object store to better preserve fileids
icewind1991 Sep 26, 2024
b9ac124
test: re-add object store primary storage phpunit tests
icewind1991 Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: ensure source folder is removed from cache when moving to object… 
…store

otherwise this causes confusion down the line as it's contents will be moved to the new cache

Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @AndyScherzinger
icewind1991 authored and AndyScherzinger committed Feb 13, 2025
commit 9fd7dfd1c2abfda400baa6ba70f57b0362d0966b
1 change: 1 addition & 0 deletions lib/private/Files/ObjectStore/ObjectStoreStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@ public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t
$this->moveFromStorage($sourceStorage, $child->getPath(), $targetInternalPath . '/' . $child->getName(), $child);
}
$sourceStorage->rmdir($sourceInternalPath);
$sourceStorage->getCache()->remove($sourceInternalPath);
} else {
$sourceStream = $sourceStorage->fopen($sourceInternalPath, 'r');
if (!$sourceStream) {
Expand Down