Skip to content

[FW][IMP] base: fix test_tz to work if target is missing#161405

Closed
fw-bot wants to merge 1 commit intoodoo:masterfrom
odoo-dev:master-15.0-fix-tz-test-xdo--ZyR-fw
Closed

[FW][IMP] base: fix test_tz to work if target is missing#161405
fw-bot wants to merge 1 commit intoodoo:masterfrom
odoo-dev:master-15.0-fix-tz-test-xdo--ZyR-fw

Conversation

@fw-bot
Copy link
Copy Markdown
Contributor

@fw-bot fw-bot commented Apr 10, 2024

See #151989 (comment)

The test test_tz_legacy will fail if the taget does not exist on the operating system.
This is breaking in some versions of the tz-data package.

Don't make this test fail if the target is missing.

Forward-Port-Of: #160868

@Xavier-Do
[IMP] base: fix test_tz to work with if target is missing
e687e61 
The test test_tz_legacy will fail if the taget does not exist on the
operating system. This is breaking in some versions of the tz-data
package. Don't make this test fail if the target is missing.

X-original-commit: 276eb01
@robodoo
Copy link
Copy Markdown
Contributor

robodoo commented Apr 10, 2024 •
edited
Loading

Pull request status dashboard.

@fw-bot fw-bot mentioned this pull request Apr 10, 2024
Closed
@fw-bot
Copy link
Copy Markdown
Contributor Author

fw-bot commented Apr 10, 2024

@Xavier-Do @d-fence cherrypicking of pull request #160868 failed.

stdout:

CONFLICT (modify/delete): odoo/addons/base/tests/test_tz.py deleted in HEAD and modified in 58a16ef1b4a1 ([IMP] base: fix test_tz to work with if target is missing).  Version 58a16ef1b4a1 ([IMP] base: fix test_tz to work with if target is missing) of odoo/addons/base/tests/test_tz.py left in tree.

stderr:

21:29:19.901108 git.c:463               trace: built-in: git cherry-pick 58a16ef1b4a1048e8a01a2242e3cd24f3a695ea5
error: could not apply 58a16ef1b4a1... [IMP] base: fix test_tz to work with if target is missing
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".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Apr 10, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Apr 10, 2024
@Xavier-Do
Copy link
Copy Markdown
Contributor

Xavier-Do commented Apr 11, 2024

will be done in #160853

@Xavier-Do Xavier-Do closed this Apr 11, 2024
@Xavier-Do Xavier-Do mentioned this pull request Apr 11, 2024
Closed
@xmo-odoo xmo-odoo deleted the master-15.0-fix-tz-test-xdo--ZyR-fw branch March 7, 2025 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@fw-bot @robodoo @Xavier-Do @C3POdoo