Skip to content

Fix e2e playwright tests popup: default buffer length#6001

Merged
rldhont merged 1 commit into3liz:masterfrom
rldhont:fix-e2e-popup-default-buffer-length
Aug 15, 2025
Merged

Fix e2e playwright tests popup: default buffer length#6001
rldhont merged 1 commit into3liz:masterfrom
rldhont:fix-e2e-popup-default-buffer-length

Conversation

@rldhont
Copy link
Copy Markdown
Collaborator

@rldhont rldhont commented Aug 15, 2025

After 4f47864 homogenize end2end Playwright popup tests about default buffer length.

After 4f47864 homogenize end2end Playwright popup tests about default buffer length
@rldhont rldhont force-pushed the fix-e2e-popup-default-buffer-length branch from 2cced78 to c3225a9 Compare August 15, 2025 14:57
@rldhont rldhont merged commit 13f277c into 3liz:master Aug 15, 2025
18 checks passed
@3liz-bot
Copy link
Copy Markdown
Contributor

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c3225a981... Fix e2e playwright tests popup: default buffer length
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging tests/end2end/playwright/popup.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/popup.spec.js

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_8 release_3_8
# Navigate to the new working tree
cd .worktrees/backport-release_3_8
# Create a new branch
git switch --create backport-6001-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c3225a9817b0a2371126b08c49e015d588d02a3f
# Push it to GitHub
git push --set-upstream origin backport-6001-to-release_3_8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_8

Then, create a pull request where the base branch is release_3_8 and the compare/head branch is backport-6001-to-release_3_8.

@3liz-bot
Copy link
Copy Markdown
Contributor

The backport to release_3_9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c3225a981... Fix e2e playwright tests popup: default buffer length
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging tests/end2end/playwright/popup.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/popup.spec.js

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_9 release_3_9
# Navigate to the new working tree
cd .worktrees/backport-release_3_9
# Create a new branch
git switch --create backport-6001-to-release_3_9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c3225a9817b0a2371126b08c49e015d588d02a3f
# Push it to GitHub
git push --set-upstream origin backport-6001-to-release_3_9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_9

Then, create a pull request where the base branch is release_3_9 and the compare/head branch is backport-6001-to-release_3_9.

@3liz-bot
Copy link
Copy Markdown
Contributor

The backport to release_3_10 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c3225a981... Fix e2e playwright tests popup: default buffer length
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging tests/end2end/playwright/popup.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/popup.spec.js

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_10 release_3_10
# Navigate to the new working tree
cd .worktrees/backport-release_3_10
# Create a new branch
git switch --create backport-6001-to-release_3_10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c3225a9817b0a2371126b08c49e015d588d02a3f
# Push it to GitHub
git push --set-upstream origin backport-6001-to-release_3_10
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_10

Then, create a pull request where the base branch is release_3_10 and the compare/head branch is backport-6001-to-release_3_10.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants