NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] runbot: rename _merge method into _relink on error_content

Browse Source
This commit is contained in:
Christophe Monniez 2024-11-26 11:34:53 +01:00 committed by xdo
parent 0768d9c797
commit 3a485536fd
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runbot/models/build_error.py
View File

@ -455,10 +455,10 @@ class BuildErrorContent(models.Model):
def _search_trigger_ids(self, operator, value): def _search_trigger_ids(self, operator, value):
return [('build_error_link_ids.trigger_id', operator, value)] return [('build_error_link_ids.trigger_id', operator, value)]
def _merge(self): def _relink(self):
if len(self) < 2: if len(self) < 2:
return return
_logger.debug('Merging errors %s', self) _logger.debug('Relinking error contents %s', self)
base_error_content = self[0] base_error_content = self[0]
base_error = base_error_content.error_id base_error = base_error_content.error_id
errors = self.env['runbot.build.error'] errors = self.env['runbot.build.error']
@ -519,7 +519,7 @@ class BuildErrorContent(models.Model):
to_merge.append(errors_content_by_fingerprint.filtered(lambda r: r.fingerprint == fingerprint)) to_merge.append(errors_content_by_fingerprint.filtered(lambda r: r.fingerprint == fingerprint))
# this must be done in other iteration since filtered may fail because of unlinked records from _merge # this must be done in other iteration since filtered may fail because of unlinked records from _merge
for errors_content_to_merge in to_merge: for errors_content_to_merge in to_merge:
errors_content_to_merge._merge() errors_content_to_merge._relink()
def action_find_duplicates(self): def action_find_duplicates(self):
rg = [r['id_arr'] for r in self.env['runbot.build.error.content'].read_group([], ['id_count:count(id)', 'id_arr:array_agg(id)', 'fingerprint'], ['fingerprint']) if r['id_count'] >1] rg = [r['id_arr'] for r in self.env['runbot.build.error.content'].read_group([], ['id_count:count(id)', 'id_arr:array_agg(id)', 'fingerprint'], ['fingerprint']) if r['id_count'] >1]

22
runbot/tests/test_build_error.py
View File

@ -180,7 +180,7 @@ class TestBuildError(RunbotCase):
self.assertEqual(error_b.test_tags, False) self.assertEqual(error_b.test_tags, False)
self.assertEqual(error_b.active, False) self.assertEqual(error_b.active, False)
def test_merge_contents(self): def test_relink_contents(self):
build_a = self.create_test_build({'local_result': 'ko', 'local_state': 'done'}) build_a = self.create_test_build({'local_result': 'ko', 'local_state': 'done'})
error_content_a = self.BuildErrorContent.create({'content': 'foo bar'}) error_content_a = self.BuildErrorContent.create({'content': 'foo bar'})
self.BuildErrorLink.create({'build_id': build_a.id, 'error_content_id': error_content_a.id}) self.BuildErrorLink.create({'build_id': build_a.id, 'error_content_id': error_content_a.id})
@ -192,7 +192,7 @@ class TestBuildError(RunbotCase):
error_b = error_content_b.error_id error_b = error_content_b.error_id
self.assertNotEqual(error_a, error_b) self.assertNotEqual(error_a, error_b)
self.assertEqual(self.BuildErrorContent.search([('fingerprint', '=', error_content_a.fingerprint)]), error_content_a | error_content_b) self.assertEqual(self.BuildErrorContent.search([('fingerprint', '=', error_content_a.fingerprint)]), error_content_a | error_content_b)
(error_content_a | error_content_b)._merge() (error_content_a | error_content_b)._relink()
self.assertEqual(self.BuildErrorContent.search([('fingerprint', '=', error_content_a.fingerprint)]), error_content_a) self.assertEqual(self.BuildErrorContent.search([('fingerprint', '=', error_content_a.fingerprint)]), error_content_a)
self.assertTrue(error_a.active, 'The first merged error should stay active') self.assertTrue(error_a.active, 'The first merged error should stay active')
self.assertFalse(error_b.active, 'The second merged error should have stay deactivated') self.assertFalse(error_b.active, 'The second merged error should have stay deactivated')
@ -205,20 +205,20 @@ class TestBuildError(RunbotCase):
error_content_c = self.BuildErrorContent.create({'content': 'foo foo'}) error_content_c = self.BuildErrorContent.create({'content': 'foo foo'})
# let's ensure we cannot merge errors with different fingerprints # let's ensure we cannot relink errors with different fingerprints
with self.assertRaises(AssertionError): with self.assertRaises(AssertionError):
(error_content_a | error_content_c)._merge() (error_content_a | error_content_c)._relink()
# merge two build errors while the build <--> build_error relation already exists # relink two build errors while the build <--> build_error relation already exists
error_content_d = self.BuildErrorContent.create({'content': 'foo bar'}) error_content_d = self.BuildErrorContent.create({'content': 'foo bar'})
self.BuildErrorLink.create({'build_id': build_a.id, 'error_content_id': error_content_d.id}) self.BuildErrorLink.create({'build_id': build_a.id, 'error_content_id': error_content_d.id})
(error_content_a | error_content_d)._merge() (error_content_a | error_content_d)._relink()
self.assertIn(build_a, error_content_a.build_error_link_ids.build_id) self.assertIn(build_a, error_content_a.build_error_link_ids.build_id)
self.assertIn(build_a, error_content_a.build_ids) self.assertIn(build_a, error_content_a.build_ids)
self.assertFalse(error_content_d.build_error_link_ids) self.assertFalse(error_content_d.build_error_link_ids)
self.assertFalse(error_content_d.build_ids) self.assertFalse(error_content_d.build_ids)
def test_merge_simple(self): def test_relink_simple(self):
build_a = self.create_test_build({'local_result': 'ko', 'local_state': 'done'}) build_a = self.create_test_build({'local_result': 'ko', 'local_state': 'done'})
error_content_a = self.BuildErrorContent.create({'content': 'foo bar'}) error_content_a = self.BuildErrorContent.create({'content': 'foo bar'})
error_a = error_content_a.error_id error_a = error_content_a.error_id
@ -231,7 +231,7 @@ class TestBuildError(RunbotCase):
self.BuildErrorLink.create({'build_id': build_b.id, 'error_content_id': error_content_b.id}) self.BuildErrorLink.create({'build_id': build_b.id, 'error_content_id': error_content_b.id})
self.assertEqual(self.BuildErrorContent.search([('fingerprint', '=', error_content_a.fingerprint)]), error_content_a | error_content_b) self.assertEqual(self.BuildErrorContent.search([('fingerprint', '=', error_content_a.fingerprint)]), error_content_a | error_content_b)
(error_content_a | error_content_b)._merge() (error_content_a | error_content_b)._relink()
self.assertEqual(self.BuildErrorContent.search([('fingerprint', '=', error_content_a.fingerprint)]), error_content_a) self.assertEqual(self.BuildErrorContent.search([('fingerprint', '=', error_content_a.fingerprint)]), error_content_a)
self.assertFalse(error_b.error_content_ids) self.assertFalse(error_b.error_content_ids)
@ -246,13 +246,13 @@ class TestBuildError(RunbotCase):
tagged_error_content = self.BuildErrorContent.create({'content': 'foo bar'}) tagged_error_content = self.BuildErrorContent.create({'content': 'foo bar'})
tagged_error = tagged_error_content.error_id tagged_error = tagged_error_content.error_id
tagged_error.test_tags = 'bartag' tagged_error.test_tags = 'bartag'
(error_content_a | tagged_error_content)._merge() (error_content_a | tagged_error_content)._relink()
self.assertEqual(error_a.test_tags, 'footag') self.assertEqual(error_a.test_tags, 'footag')
self.assertEqual(tagged_error.test_tags, 'bartag') self.assertEqual(tagged_error.test_tags, 'bartag')
self.assertTrue(error_a.active) self.assertTrue(error_a.active)
self.assertTrue(tagged_error.active, 'A differently tagged error cannot be deactivated by the merge') self.assertTrue(tagged_error.active, 'A differently tagged error cannot be deactivated by the merge')
def test_merge_linked(self): def test_relink_linked(self):
build_a = self.create_test_build({'local_result': 'ko', 'local_state': 'done'}) build_a = self.create_test_build({'local_result': 'ko', 'local_state': 'done'})
error_content_a = self.BuildErrorContent.create({'content': 'foo bar'}) error_content_a = self.BuildErrorContent.create({'content': 'foo bar'})
error_a = error_content_a.error_id error_a = error_content_a.error_id
@ -267,7 +267,7 @@ class TestBuildError(RunbotCase):
linked_error = self.BuildErrorContent.create({'content': 'foo foo bar', 'error_id': error_b.id}) linked_error = self.BuildErrorContent.create({'content': 'foo foo bar', 'error_id': error_b.id})
self.assertEqual(self.BuildErrorContent.search([('fingerprint', '=', error_content_a.fingerprint)]), error_content_a | error_content_b) self.assertEqual(self.BuildErrorContent.search([('fingerprint', '=', error_content_a.fingerprint)]), error_content_a | error_content_b)
(error_content_a | error_content_b)._merge() (error_content_a | error_content_b)._relink()
self.assertEqual(self.BuildErrorContent.search([('fingerprint', '=', error_content_a.fingerprint)]), error_content_a) self.assertEqual(self.BuildErrorContent.search([('fingerprint', '=', error_content_a.fingerprint)]), error_content_a)
self.assertEqual(error_b.error_content_ids, linked_error) self.assertEqual(error_b.error_content_ids, linked_error)
self.assertTrue(error_a.active, 'Main error should have been reactivated') self.assertTrue(error_a.active, 'Main error should have been reactivated')