fix

Author: Xavier-Do

runbot/container.py

@@ -261,7 +261,7 @@ def _docker_run(cmd=False, log_path=False, build_dir=False, container_name=False
     run_cmd = f'cd /data/build;touch start-{container_name};{run_cmd};cd /data/build;touch end-{container_name}'
     run_cmd_repr = str(run_cmd)
     if len(run_cmd_repr) > 250:
-        run_cmd_repr = run_cmd_repr[:250] + '...' 
+        run_cmd_repr = run_cmd_repr[:250] + '...'
     _logger.info('Docker run command: %s', run_cmd_repr)
     docker_clear_state(container_name, build_dir)  # ensure that no state are remaining
     build_dir = file_path(build_dir)

runbot/models/build.py

@@ -10,23 +10,36 @@
 import shutil
 import time
 import uuid
-
 from collections import defaultdict
-from dateutil import parser
 from pathlib import Path
+
+from dateutil import parser
 from psycopg2 import sql
 from psycopg2.extensions import TransactionRollbackError
 
-from ..common import dt2time, now, grep, local_pgadmin_cursor, dest_reg, os, list_local_dbs, pseudo_markdown, RunbotException, findall, sanitize, markdown_escape, tail, transactioncache
-from ..container import docker_stop, docker_state, Command, docker_run, docker_pull
-from ..fields import JsonDictField
-
-from odoo import models, fields, api
-
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools import file_open, file_path
 from odoo.tools.safe_eval import safe_eval
 
+from ..common import (
+    RunbotException,
+    dest_reg,
+    dt2time,
+    findall,
+    grep,
+    list_local_dbs,
+    local_pgadmin_cursor,
+    markdown_escape,
+    now,
+    os,
+    pseudo_markdown,
+    sanitize,
+    tail,
+    transactioncache,
+)
+from ..container import Command, docker_pull, docker_run, docker_state, docker_stop
+from ..fields import JsonDictField
 
 _logger = logging.getLogger(__name__)
 

runbot/models/build_config.py

@@ -59,6 +59,7 @@ def get_dependant(modules, build, dynamic_vars, depth=None):
     dependant = set(build._get_dependant_modules(modules, depth)) - set(modules)
     return ','.join(sorted(dependant))
 
+
 def filter_default_modules(selector, build, dynamic_vars):
     modules = build._get_modules_to_test(selector)
     return ','.join(modules)
@@ -79,6 +80,7 @@ def keep_modified_modules(modules, build, dynamic_vars, *defaults):
     filtered_modules = [module for module in modules if module in modified_modules]
     return ','.join(filtered_modules)
 
+
 def make_module_test_tags(modules, build, dynamic_vars):
     return ','.join([f'/{module}' for module in modules.split(',')])
 
@@ -1539,7 +1541,7 @@ def _run_dynamic(self, build):
         raw_vars = {}
         for config_vars in config_vars_list:
             raw_vars.update(config_vars)
-            
+
         raw_vars.update(build.params_id.config_data.get('dynamic_vars', {}))
         dynamic_vars = {}
         # dynamic_vars can either be raw value like 'account', value to evaluate lazily in anothed dynamic value like 'account->!mail'
@@ -1552,12 +1554,12 @@ def _run_dynamic(self, build):
             dynamic_vars[key] = self._parse_dynamic_entry(value, build, dynamic_vars=dynamic_vars)
 
         current_step = self._get_dynamic_step(build)
-        if current_step.get('log'):
-            text = self._parse_dynamic_entry(current_step['log'], build, dynamic_vars=dynamic_vars)
-            build._log('_run_dynamic', text)
         if not current_step:
             build._log('Dynamic Step', 'No dynamic config or steps found, skipping', level="WARNING")
             return
+        if current_step.get('log'):
+            text = self._parse_dynamic_entry(current_step['log'], build, dynamic_vars=dynamic_vars)
+            build._log('_run_dynamic', text)
         if current_step['job_type'] == 'create_build':
             for_each_vars_list = current_step.get('for_each_vars', [{}])
             if 'for_each_module' in current_step:

runbot/models/commit.py

@@ -3,7 +3,6 @@
 import subprocess
 
 from ..common import os, RunbotException, make_github_session, transactioncache
-import glob
 import shutil
 
 from odoo import models, fields, api
@@ -193,10 +192,10 @@ def _git_show_files(self, files):
             header = buffer[offset:newline_idx].decode('utf-8')
             offset = newline_idx + 1
             try:
-                size_in_bytes = int(header.rsplit(' ',1)[-1])
+                size_in_bytes = int(header.rsplit(' ', 1)[-1])
             except ValueError:  # most likely missing
-                 results.append(False)
-                 continue
+                results.append(False)
+                continue
             results.append(buffer[offset : offset + size_in_bytes].decode('utf-8', errors='replace'))
             offset += size_in_bytes + 1
         return results

runbot/tests/common.py

@@ -12,7 +12,7 @@
 
 class RunbotCase(TransactionCase):
 
-    def mock_git_helper(self, repo, cmd):
+    def mock_git_helper(self, repo, cmd, input_data=None, raw=False):
         """Helper that returns a mock for repo._git()"""
         if cmd[:2] == ['show', '-s'] or cmd[:3] == ['show', '--pretty="%H -- %s"', '-s']:
             return 'commit message for %s' % cmd[-1]
@@ -196,8 +196,8 @@ def setUp(self):
         self.docker_run_calls = []
         self.diff = ''
 
-        def mock_git(repo, cmd, quiet=False):
-            return self.mock_git_helper(repo, cmd)
+        def mock_git(repo, cmd, quiet=False, input_data=None, raw=False):
+            return self.mock_git_helper(repo, cmd, input_data=input_data, raw=raw)
 
         self.start_patcher('git_patcher', 'odoo.addons.runbot.models.repo.Repo._git', new=mock_git)
         self.start_patcher('hostname_patcher', 'odoo.addons.runbot.common.socket.gethostname', 'host.runbot.com')

runbot/tests/test_build_config_step.py

@@ -451,22 +451,36 @@ def setUp(self):
             "web_enterprise": ["web"],
         }
 
-    def mock_git_helper(self, repo, cmd):
-        if repo == self.repo_odoo and cmd == ['show', 'dfdfcfcf0000ffffffffffffffffffffffffffff:odoo/tests/.runbot/parallel_testing.json']:
-            return self.config_file
-        elif repo == self.repo_odoo and cmd == ['show', 'dfdfcfcf0000ffffffffffffffffffffffffffff:odoo/tests/.runbot/l10n_standalone_testing.json']:
-            return self.l10n_standalone_testing_file
-        elif cmd[0] == 'show' and cmd[1].endswith('__manifest__.py'):
-            module = cmd[1].split(':')[-1].split('/')[-2]
-            return """{
-                'name': '%s',
-                'depends': %s,
-            }""" % (module, self.module_dependencies.get(module, []))
-        elif 'show' in cmd:
+    def mock_git_helper(self, repo, cmd, input_data=None, raw=False):
+        def make_catfile_output(commit, content):
+            content_bytes = content.encode('utf-8')
+            header = f"{commit} blob {len(content_bytes)}\n".encode()
+            result = header + content_bytes + b"\n"
+            return result
+
+        if cmd == ['cat-file', '--batch']:
+            if repo == self.repo_odoo and input_data == 'dfdfcfcf0000ffffffffffffffffffffffffffff:odoo/tests/.runbot/parallel_testing.json\n':
+                return make_catfile_output('dfdfcfcf0000ffffffffffffffffffffffffffff', self.config_file)
+            if repo == self.repo_odoo and input_data == 'dfdfcfcf0000ffffffffffffffffffffffffffff:odoo/tests/.runbot/l10n_standalone_testing.json\n':
+                return make_catfile_output('dfdfcfcf0000ffffffffffffffffffffffffffff', self.l10n_standalone_testing_file)
+
+            if "__manifest__.py" in input_data:
+                modules_info = [
+                    (line, line.split(':')[-1].split('/')[-2])
+                    for line in input_data.splitlines()
+                    if line.endswith('__manifest__.py')
+                ]
+                result = b""
+                for original_query, module in modules_info:
+                    content = '''{'name': '%s', 'depends': %s}''' % (module, self.module_dependencies.get(module, []))
+                    result += make_catfile_output(original_query.split(':')[0], content)
+                return result
+
+        if cmd == ['cat-file', '--batch']:
             raise subprocess.CalledProcessError(cmd, 128)
         elif 'diff' in cmd:
             return 'odoo/addons/crm/some/file.py\nodoo/addons/project/some/file.py'
-        return super().mock_git_helper(repo, cmd)
+        return super().mock_git_helper(repo, cmd, input_data, raw)
 
     def test_module_filters(self):
         self.assertEqual(self.build._get_modules_to_test('-> !mail'), ['account', 'base', 'crm', 'documents'])
@@ -859,7 +873,7 @@ def test_modified_existing_module(self):
         self.assertEqual(child_dynamic_vars, {
             'modified_modules': 'crm,mail',
             'test_modules': 'test_mail',
-            'modules_to_test': 'crm,mail,test_mail'
+            'modules_to_test': 'crm,mail,test_mail',
         })
 
     def test_modified_existing_module_parallel(self):

runbot/tests/test_repo.py

@@ -372,7 +372,7 @@ def setUp(self):
         self.fetch_count = 0
         self.force_failure = False
 
-    def mock_git_helper(self, repo, cmd):
+    def mock_git_helper(self, repo, cmd, input_data=None, raw=False):
         self.assertIn('fetch', cmd)
         self.fetch_count += 1
         if self.fetch_count < 3 or self.force_failure:
@@ -457,7 +457,7 @@ def setUp(self):
         super().setUp()
         self.test_refs = []
 
-    def mock_git_helper(self, repo, cmd):
+    def mock_git_helper(self, repo, cmd, input_data=None, raw=False):
         self.assertIn('for-each-ref', cmd)
         self.assertIn('refs/*/pull/*', cmd)
         return '\n'.join(['\x00'.join(ref_data) for ref_data in self.test_refs])