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: Added Location seach #4887

Merged
merged 2 commits into from
Oct 22, 2024

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Oct 17, 2024

Testing that search is well activated.

@rldhont rldhont added tests unit tests and docker configuration for tests run end2end If the PR must run end2end tests or not backport release_3_7 backport release_3_8 backport release_3_9 labels Oct 17, 2024
@github-actions github-actions bot added this to the 3.10.0 milestone Oct 17, 2024
@rldhont rldhont force-pushed the tests-e2e-playwright-location_search branch from 5d3d38a to 0619909 Compare October 18, 2024 15:53
@rldhont rldhont merged commit 721b359 into 3liz:master Oct 22, 2024
13 checks passed
@3liz-bot
Copy link
Contributor

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 782b6708b... Tests e2e playwright: Goto map cannot wait for GetLegendGraphics request
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 advice.mergeConflict false"

stdout
Auto-merging tests/end2end/playwright/globals.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/globals.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_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-4887-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 782b6708b42eb540dcdb6bacb942296c2a52984f,06199096fdeb3dddfc990297e9c1ab8e3c6577ab
# Push it to GitHub
git push --set-upstream origin backport-4887-to-release_3_7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_7

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_7 backport release_3_8 backport release_3_9 failed backport 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