Skip to content

Run WebDAV integration tests against S3 - #34835

Merged
juliusknorr merged 3 commits into
masterfrom
tests/integration-s3
Mar 7, 2023
Merged

Run WebDAV integration tests against S3#34835
juliusknorr merged 3 commits into
masterfrom
tests/integration-s3

Conversation

@juliusknorr

@juliusknorrjuliusknorr commented Oct 27, 2022•
edited
Loading

Copy link
Copy Markdown
Member

Run webdav related tests against minio so we have some testing of real world file interaction behaviour in the CI.

This includes two fixes to let the tests pass properly.

  • First one ensures that the cache of storage statistics is properly reset if the user quota is changed. This is needed as other integration tests do not seem to run with caching enabled and therefore pass.
  • Second fix makes sure that the normalised path is used for caching the statistics and getting them from sabre uses the same path as other code paths.

Needed for #27034

@juliusknorr
juliusknorrforce-pushed the tests/integration-s3 branch 2 times, most recently from e9e9df4 to 69e8b42CompareNovember 4, 2022 16:26
@juliusknorr

juliusknorr commented Nov 7, 2022

Copy link
Copy Markdown
MemberAuthor

Other two failures seem related to running the tests with a memory cache in place:

Due to bdfef2d the quota is outdated for 5 minutes

@PVince81

PVince81 commented Dec 16, 2022

Copy link
Copy Markdown
Member

@juliushaertl depending how you query it now, we removed the delay in some code paths, see #35308

however, some other code paths will need adjusting as well: #35421

@juliusknorr
juliusknorrforce-pushed the tests/integration-s3 branch 2 times, most recently from c534fd6 to 087de82CompareFebruary 3, 2023 21:37
@juliusknorr
juliusknorrforce-pushed the tests/integration-s3 branch 3 times, most recently from ee0fca0 to 1b2e380CompareFebruary 18, 2023 16:15
@juliusknorrjuliusknorr added 3. to review Waiting for reviews tests Related to tests labels Feb 20, 2023
@juliusknorrjuliusknorr added this to the Nextcloud 26 milestone Feb 20, 2023
@juliusknorr
juliusknorr changed the base branch from master to bugfix/noid/sabre-nodesFebruary 20, 2023 07:49
@juliusknorr

juliusknorr commented Feb 20, 2023

Copy link
Copy Markdown
MemberAuthor

Can already be reviewed just waiting to remove the draft state until the required pr is in.

come-nc
come-nc reviewed Feb 20, 2023
View reviewed changes

@come-nccome-nc left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please update PR name and description to explain included fixes, or move these fixes to another PR, to help with the Changelog.

Comment threadapps/provisioning_api/lib/Controller/UsersController.php Outdated
Comment threadlib/private/legacy/OC_Helper.php Outdated
@juliusknorr
juliusknorrforce-pushed the bugfix/noid/sabre-nodes branch from 8b9b738 to 750a5a2CompareFebruary 20, 2023 21:13
@juliusknorr
juliusknorr changed the base branch from bugfix/noid/sabre-nodes to masterFebruary 21, 2023 10:25
@juliusknorr

juliusknorr commented Feb 21, 2023

Copy link
Copy Markdown
MemberAuthor

Please update PR name and description to explain included fixes, or move these fixes to another PR, to help with the Changelog.

Sorry, I've updated the description accordingly and addressed your first feedback :)

@juliusknorr
juliusknorr marked this pull request as ready for review February 21, 2023 17:53
@juliusknorr

juliusknorr commented Feb 21, 2023

Copy link
Copy Markdown
MemberAuthor

Failure unrelated (fix is in #36799)

come-nc
come-nc reviewed Feb 23, 2023
View reviewed changes
Comment threadapps/dav/lib/Connector/Sabre/Directory.php Outdated
@skjnldsvskjnldsv mentioned this pull request Feb 23, 2023
Merged
@juliusknorr
juliusknorrforce-pushed the tests/integration-s3 branch 2 times, most recently from c61aab0 to f155e23CompareMarch 2, 2023 21:22
@juliusknorr
juliusknorr requested a review from come-ncMarch 2, 2023 22:05
@juliusknorr

juliusknorr commented Mar 6, 2023

Copy link
Copy Markdown
MemberAuthor

/rebase

@juliusknorr
Run webdav related integration tests on github actions
b59cf4c
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr
fix: Recalculate storage statistics on updating the quota
3287edd
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr
fix: Use proper path for quota fetching
d515da5
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr
juliusknorr merged commit 9e73412 into masterMar 7, 2023
@juliusknorr
juliusknorr deleted the tests/integration-s3 branch March 7, 2023 06:20
@juliusknorr

juliusknorr commented Mar 7, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to stable26

@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Mar 7, 2023
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@icewind1991icewind1991icewind1991 approved these changes
@come-nccome-nccome-nc approved these changes
@artongeartongeAwaiting requested review from artonge

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewstestsRelated to tests

Projects

None yet

Milestone

Nextcloud 26

Development

Successfully merging this pull request may close these issues.

4 participants

@juliusknorr@PVince81@icewind1991@come-nc