mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24976 from nextcloud/backport/24961/stable20 

[stable20] Fix unreliable ViewTest
This commit is contained in:
Roeland Jago Douma 2021-01-07 13:17:29 +01:00 committed by GitHub
parent 2dbf407f7e 8d9fa73371
commit 0f395d8527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Files/Storage/Common.php
View File

@ -688,9 +688,9 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
$result = $this->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, true); $result = $this->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, true);
if ($result) { if ($result) {
if ($sourceStorage->is_dir($sourceInternalPath)) { if ($sourceStorage->is_dir($sourceInternalPath)) {
$result &= $sourceStorage->rmdir($sourceInternalPath); $result = $result && $sourceStorage->rmdir($sourceInternalPath);
} else { } else {
$result &= $sourceStorage->unlink($sourceInternalPath); $result = $result && $sourceStorage->unlink($sourceInternalPath);
} }
} }
return $result; return $result;

5
tests/lib/Files/ViewTest.php
View File

@ -17,6 +17,7 @@ use OC\Files\View;
use OCP\Constants; use OCP\Constants;
use OCP\Files\Config\IMountProvider; use OCP\Files\Config\IMountProvider;
use OCP\Files\FileInfo; use OCP\Files\FileInfo;
use OCP\Files\GenericFileException;
use OCP\Files\Storage\IStorage; use OCP\Files\Storage\IStorage;
use OCP\Lock\ILockingProvider; use OCP\Lock\ILockingProvider;
use OCP\Lock\LockedException; use OCP\Lock\LockedException;
@ -1163,11 +1164,11 @@ class ViewTest extends \Test\TestCase {
/** @var \PHPUnit\Framework\MockObject\MockObject|Temporary $storage2 */ /** @var \PHPUnit\Framework\MockObject\MockObject|Temporary $storage2 */
$storage2 = $this->getMockBuilder(TemporaryNoCross::class) $storage2 = $this->getMockBuilder(TemporaryNoCross::class)
->setConstructorArgs([[]]) ->setConstructorArgs([[]])
->setMethods(['fopen']) ->setMethods(['fopen', 'writeStream'])
->getMock(); ->getMock();
$storage2->method('writeStream') $storage2->method('writeStream')
->willReturn(0); ->willThrowException(new GenericFileException("Failed to copy stream"));
$storage1->mkdir('sub'); $storage1->mkdir('sub');
$storage1->file_put_contents('foo.txt', '0123456789ABCDEFGH'); $storage1->file_put_contents('foo.txt', '0123456789ABCDEFGH');