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

[FIX] runbot: fix repo.modules is False case

Browse Source
This commit is contained in:
Xavier-Do 2024-02-21 11:04:25 +01:00
parent f26065c4dc
commit 2ba3238a34
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runbot/models/build.py
View File

@ -929,7 +929,7 @@ class BuildResult(models.Model):
modules = self._get_available_modules()
params_patterns = (self.params_id.modules or '').split(',')
modules_patterns = (modules_patterns or '').split(',')
return trigger._filter_modules_to_test(modules, params_patterns + modules_patterns)
return trigger._filter_modules_to_test(modules, params_patterns + modules_patterns) # we may switch params_patterns and modules_patterns order
def _local_pg_dropdb(self, dbname):
msg = ''

5
runbot/models/repo.py
View File

@ -127,8 +127,9 @@ class Trigger(models.Model):
# repo specific filters
for repo, repo_available_modules in modules.items():
repo_modules = repo_available_modules
repo_modules = _filter_patterns(repo.modules.split(','), repo_modules, repo_available_modules)
repo_modules = set(repo_available_modules)
if repo.modules:
repo_modules = _filter_patterns(repo.modules.split(','), repo_modules, repo_available_modules)
module_pattern = repo_module_patterns.get(repo)
if module_pattern:
repo_modules = _filter_patterns(module_pattern, repo_modules, repo_available_modules)

6
runbot/tests/test_build.py
View File

@ -201,6 +201,12 @@ class TestBuildResult(RunbotCase):
}
self.repo_server.modules = '-bad_module,-hw_*,hw_explicit,-l10n_*'
self.repo_addons.modules = False # no filter, should not crash
modules_to_test = build._get_modules_to_test(modules_patterns='')
self.assertEqual(modules_to_test, sorted(['good_module', 'hwgood', 'other_good', 'hw_explicit', 'other_mod_1', 'other_mod_2']))
self.repo_addons.modules = '-*'
modules_to_test = build._get_modules_to_test(modules_patterns='')