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

[FW][FIX] product: Variants settings on specific test #159818

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 28, 2024

Some tests on dynamic variants mechanism didn't pass on test without demo data due to #143543.

Forward-Port-Of: #159709

@robodoo
Copy link
Contributor

robodoo commented Mar 28, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 28, 2024

@BHanq cherrypicking of pull request #159709 failed.

stdout:

Auto-merging addons/product/tests/test_name.py
Auto-merging addons/product/tests/test_variants.py
Auto-merging addons/stock/tests/test_product.py
CONFLICT (content): Merge conflict in addons/stock/tests/test_product.py

stderr:

23:46:03.737432 git.c:463               trace: built-in: git cherry-pick bf09a256716ede4dc9f9f9f0ce7a7c4a8fefcfe5
error: could not apply bf09a256716e... [FIX] product: Variants settings on specific test
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 Mar 28, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Mar 28, 2024
Some tests on dynamic variants mechanism didn't pass on test
without demo data due to odoo#143543.

X-original-commit: a949ae1
@BHanq BHanq force-pushed the 16.0-15.0-product_template_name_search_test-beha-hm3d-fw branch from bcc4855 to 6d3a47d Compare March 29, 2024 10:04
@BHanq
Copy link

BHanq commented Mar 29, 2024

robodoo r+

robodoo pushed a commit that referenced this pull request Mar 29, 2024
Some tests on dynamic variants mechanism didn't pass on test
without demo data due to #143543.

closes #159818

X-original-commit: a949ae1
Signed-off-by: Benjamin Hanquin (beha) <beha@odoo.com>
@robodoo robodoo closed this Mar 29, 2024
@fw-bot fw-bot deleted the 16.0-15.0-product_template_name_search_test-beha-hm3d-fw branch April 12, 2024 13:47
willylohws pushed a commit to willylohws/odoo that referenced this pull request May 1, 2024
Some tests on dynamic variants mechanism didn't pass on test
without demo data due to odoo#143543.

closes odoo#159818

X-original-commit: a949ae1
Signed-off-by: Benjamin Hanquin (beha) <beha@odoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

None yet

5 participants