Skip to content

[stable23] Run tests with primary object storage in CI + large upload fixes #31453

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
blizzz merged 6 commits into from
Apr 14, 2022
Merged

[stable23] Run tests with primary object storage in CI + large upload fixes #31453

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c0d53d
run ci with primary s3 setup
icewind1991 Feb 25, 2022
4167915
return dummy availability if storage is not found in cache
icewind1991 Feb 25, 2022
605d97e
skip localstorage dependend trashbin test when not using local user s…
icewind1991 Feb 25, 2022
c13f89a
make share cache test resilient against skeleton files not being there
icewind1991 Feb 25, 2022
90c27a7
skip localstorage dependend user test when not using local user storage
icewind1991 Feb 25, 2022
b05c9fe
also handle expired pre-write shared lock on dav upload when not usin…
icewind1991 Feb 25, 2022
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
Next Next commit
skip localstorage dependend user test when not using local user storage 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @blizzz
icewind1991 authored and blizzz committed Mar 10, 2022
commit 90c27a7d3048efaa8c7e30b71df037c21e3bd3ab
12 changes: 12 additions & 0 deletions tests/lib/User/UserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
namespace Test\User;

use OC\AllConfig;
use OC\Files\Mount\ObjectHomeMountProvider;
use OC\Hooks\PublicEmitter;
use OC\User\User;
use OCP\Comments\ICommentsManager;
use OCP\Files\Storage\IStorageFactory;
use OCP\IConfig;
use OCP\IUser;
use OCP\Notification\IManager as INotificationManager;
Expand Down Expand Up @@ -214,6 +216,16 @@ public function testDelete() {
}

public function testDeleteWithDifferentHome() {

/** @var ObjectHomeMountProvider $homeProvider */
$homeProvider = \OC::$server->get(ObjectHomeMountProvider::class);
$user = $this->createMock(IUser::class);
$user->method('getUID')
->willReturn('foo');
if ($homeProvider->getHomeMountForUser($user, $this->createMock(IStorageFactory::class)) !== null) {
$this->markTestSkipped("Skipping test for non local home storage");
}

/**
* @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend
*/
Expand Down