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

Tests e2e playwright print refactoring #5324

Merged
merged 12 commits into from
Feb 3, 2025

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Feb 1, 2025

Refactoring print end2end playwright tests.

@rldhont rldhont added tests unit tests and docker configuration for tests refactoring run end2end If the PR must run end2end tests or not backport release_3_8 backport release_3_9 labels Feb 1, 2025
@github-actions github-actions bot added this to the 3.10.0 milestone Feb 1, 2025
@rldhont
Copy link
Collaborator Author

rldhont commented Feb 1, 2025

Extracting Print in project projection part of #5267

Waiting for #5323 to use checkParameters method.

@rldhont rldhont force-pushed the tests-e2e-print-refactoring branch 2 times, most recently from 87ca4d1 to 28e6dca Compare February 3, 2025 10:32
@Gustry
Copy link
Member

Gustry commented Feb 3, 2025

If needed, I have added a commit on master : 4a99be4

@rldhont
Copy link
Collaborator Author

rldhont commented Feb 3, 2025

Not related failing test : cypress external_wms_layer-ghaction.js

@rldhont rldhont marked this pull request as ready for review February 3, 2025 11:37
@rldhont rldhont requested a review from Gustry February 3, 2025 11:37
Copy link
Member

@Gustry Gustry left a comment

Choose a reason for hiding this comment

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

LGTM

We can improve the tests after this PR

@rldhont rldhont merged commit f38ab83 into 3liz:master Feb 3, 2025
16 of 17 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Feb 3, 2025

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 7d8f3fe57... Tests e2e playwright Print - refactoring in print requests
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/print.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/print.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-5324-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7d8f3fe570c807ad31298b8dc4e129ba52354e9f,4be146de899711bcac741b2946fc1b360db79f71,552b7b41a6808b46b35bab07a1a2dd235edf9185,6a8d4cf397171402de7c053c2d1ed536922e65b8,b61928c105f152c1d3bf516f6c25e831a24064e7,53ea192ba80b06f24521e64b6259eb67c8012008,be766ae45682df147b43adc22c3284b2f92b2e3e,707808bbc913527718aea51b2004bbb1fd3a3054,4b44369cf901df6d998dcd871bcfae926e5971da,f9aba8204fde304a512a4f6fdff905b0c0e483dd,a3f9d3816897623521f8ba8a7d5616c3d081728a,93251d29ccb53a500a3e68a44e4cad1fffe5932f
# Push it to GitHub
git push --set-upstream origin backport-5324-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-5324-to-release_3_8.

@3liz-bot
Copy link
Contributor

3liz-bot commented Feb 3, 2025

The backport to release_3_9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 7d8f3fe57... Tests e2e playwright Print - refactoring in print requests
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/print.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/print.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-5324-to-release_3_9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7d8f3fe570c807ad31298b8dc4e129ba52354e9f,4be146de899711bcac741b2946fc1b360db79f71,552b7b41a6808b46b35bab07a1a2dd235edf9185,6a8d4cf397171402de7c053c2d1ed536922e65b8,b61928c105f152c1d3bf516f6c25e831a24064e7,53ea192ba80b06f24521e64b6259eb67c8012008,be766ae45682df147b43adc22c3284b2f92b2e3e,707808bbc913527718aea51b2004bbb1fd3a3054,4b44369cf901df6d998dcd871bcfae926e5971da,f9aba8204fde304a512a4f6fdff905b0c0e483dd,a3f9d3816897623521f8ba8a7d5616c3d081728a,93251d29ccb53a500a3e68a44e4cad1fffe5932f
# Push it to GitHub
git push --set-upstream origin backport-5324-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-5324-to-release_3_9.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_8 backport release_3_9 failed backport refactoring run end2end If the PR must run end2end tests or not tests unit tests and docker configuration for tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants