Skip to content

Add removal of mounts without storages to files:cleanup command #21729

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
rullzer merged 2 commits into from
Jul 8, 2020
Merged

Add removal of mounts without storages to files:cleanup command #21729

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
479aa97
Add removal of mounts without storages to files:cleanup command
juliusknorr Jul 7, 2020
c06e69c
Test for proper removal of mount entries
juliusknorr Jul 8, 2020
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
Prev Previous commit
Test for proper removal of mount entries 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Jul 8, 2020
commit c06e69c9dd45634620d8a9a70c29ae410c45caf0
21 changes: 20 additions & 1 deletion apps/files/tests/Command/DeleteOrphanedFilesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ protected function getFile($fileId) {
return $stmt->fetchAll();
}

protected function getMounts($storageId) {
$stmt = $this->connection->executeQuery('SELECT * FROM `*PREFIX*mounts` WHERE `storage_id` = ?', [$storageId]);
return $stmt->fetchAll();
}

/**
* Test clearing orphaned files
*/
Expand All @@ -98,34 +103,48 @@ public function testClearFiles() {
->disableOriginalConstructor()
->getMock();

// scan home storage so that mounts are properly setup
\OC::$server->getRootFolder()->getUserFolder($this->user1)->getStorage()->getScanner()->scan('');

$this->loginAsUser($this->user1);


$view = new View('/' . $this->user1 . '/');
$view->mkdir('files/test');

$fileInfo = $view->getFileInfo('files/test');

$storageId = $fileInfo->getStorage()->getId();
$numericStorageId = $fileInfo->getStorage()->getStorageCache()->getNumericId();

$this->assertCount(1, $this->getFile($fileInfo->getId()), 'Asserts that file is available');
$this->assertCount(1, $this->getMounts($numericStorageId), 'Asserts that mount is available');

$this->command->execute($input, $output);

$this->assertCount(1, $this->getFile($fileInfo->getId()), 'Asserts that file is still available');
$this->assertCount(1, $this->getMounts($numericStorageId), 'Asserts that mount is still available');


$deletedRows = $this->connection->executeUpdate('DELETE FROM `*PREFIX*storages` WHERE `id` = ?', [$storageId]);
$this->assertNotNull($deletedRows, 'Asserts that storage got deleted');
$this->assertSame(1, $deletedRows, 'Asserts that storage got deleted');

// parent folder, `files`, ´test` and `welcome.txt` => 4 elements
$output
->expects($this->once())
->expects($this->at(0))
->method('writeln')
->with('3 orphaned file cache entries deleted');

$output
->expects($this->at(1))
->method('writeln')
->with('1 orphaned mount entries deleted');

$this->command->execute($input, $output);

$this->assertCount(0, $this->getFile($fileInfo->getId()), 'Asserts that file gets cleaned up');
$this->assertCount(0, $this->getMounts($numericStorageId), 'Asserts that mount gets cleaned up');

// since we deleted the storage it might throw a (valid) StorageNotAvailableException
try {
Expand Down