Skip to content

[REF] product: Set max iterations to look for product combinations #627

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.

Sign up for GitHub

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

Open
moylop260 wants to merge 1 commit into
base: 17.0
Choose a base branch
from
Open

[REF] product: Set max iterations to look for product combinations #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion addons/product/models/product_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1263,8 +1263,14 @@ def _cartesian_product(self, product_template_attribute_values_per_line, parent_
line_index = 0
# determines which ptav we're working on
current_ptav = None

max_iterations = self.env['ir.config_parameter'].sudo().get_param('product.combination_limit', 200000)
count = 0
while True:
count += 1
if count > max_iterations:
_logger.warning("'product.combination_limit' %s reached for product_template %s product_template_attribute_values_per_line %s parent_combination %s.",
count, self.id, product_template_attribute_values_per_line, parent_combination)
break
current_line_values = product_template_attribute_values_per_line[line_index]
current_ptav_index = value_index_per_line[line_index]

Expand Down
12 changes: 12 additions & 0 deletions addons/product/tests/test_product_attribute_value_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,3 +792,15 @@ def test_copy_extra_prices_of_product_attribute_values(self):
'price_extra'
)
self.assertEqual(extra_prices, copied_extra_prices)

def test_combination_infinite_loop(self):
"""Test infinite-loop (while True) to get combinations"""
product_tmpls = self.env['product.template'].search([
('attribute_line_ids.attribute_id.create_variant', '=', 'always'),
('attribute_line_ids.product_template_value_ids', '!=', False)])
with self.assertLogs("odoo.addons.product.models.product_template", level="WARNING") as capture:
for product_tmpl in product_tmpls:
product_tmpl.attribute_line_ids.product_template_value_ids.unlink()
product_tmpl._get_first_possible_combination()
limit_warned = any("product.combination_limit" in rec.message for rec in capture.records)
self.assertTrue(limit_warned, "The combination was not stuck")