Skip to content
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.

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

[stable31] test(e2e): adjust trashbin tests to be less flaky #51257

Merged
merged 1 commit into from
Mar 5, 2025

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Mar 5, 2025

Backport of #51211

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot requested review from come-nc, kesselb and susnux March 5, 2025 07:19
@backportbot backportbot bot added 3. to review Waiting for reviews tests Related to tests labels Mar 5, 2025
@backportbot backportbot bot added this to the Nextcloud 31.0.1 milestone Mar 5, 2025
1. Move general files delete action (thats not trashbin app!) to files
   tests.
2. Delete files (move to trashbin) before loading the page so previews
   are not generated so they cannot lock the file.

Signed-off-by: Ferdinand Thiessen <[email protected]>
@susnux susnux force-pushed the backport/51211/stable31 branch from af13a38 to 571124b Compare March 5, 2025 07:25
@susnux susnux marked this pull request as ready for review March 5, 2025 07:25
@skjnldsv skjnldsv merged commit 0729301 into stable31 Mar 5, 2025
121 of 123 checks passed
@skjnldsv skjnldsv deleted the backport/51211/stable31 branch March 5, 2025 08:17
@skjnldsv
Copy link
Member

skjnldsv commented Mar 5, 2025

/backport to stable30

Copy link
Author

backportbot bot commented Mar 5, 2025

The backport to stable30 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable30
git pull origin stable30

# Create the new backport branch
git checkout -b backport/51257/stable30

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 571124bc

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/51257/stable30

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@skjnldsv
Copy link
Member

skjnldsv commented Mar 5, 2025

worth a try 😁

@blizzz blizzz mentioned this pull request Mar 5, 2025
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews backport-request tests Related to tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants