[FIX] runbot: adapt upgrade test

odoo · Apr 15, 2024 · c0d5e31 · c0d5e31
1 parent 76c34b9
commit c0d5e31
Show file tree

Hide file tree

Showing 3 changed files with 272 additions and 281 deletions.
diff --git a/runbot/models/build_config.py b/runbot/models/build_config.py
@@ -642,7 +642,7 @@ def _run_configure_upgrade(self, build):
                         dbs = dump_builds.database_ids.sorted('db_suffix')
                         valid_databases += list(self._filter_upgrade_database(dbs, upgrade_db.db_pattern))
                         if not valid_databases:
-                            build._log('_run_configure_upgrade', 'No datase found for pattern %s' % (upgrade_db.db_pattern), level='ERROR')
+                            build._log('_run_configure_upgrade', 'No database found for pattern %s' % (upgrade_db.db_pattern), level='ERROR')
                 for db in valid_databases:
                     #commit_ids = build.params_id.commit_ids
                     #if commit_ids != target.params_id.commit_ids:
@@ -656,7 +656,7 @@ def _run_configure_upgrade(self, build):
                         'upgrade_to_build_id': target.id,
                         'upgrade_from_build_id': source,
                         'dump_db': db.id,
-                        'config_id': self.upgrade_config_id
+                        'config_id': self.upgrade_config_id,
                     })
 
                     child.description = 'Testing migration from %s to %s using db %s (%s)' % (

diff --git a/runbot/tests/test_dockerfile.py b/runbot/tests/test_dockerfile.py
@@ -3,7 +3,8 @@
 
 from unittest.mock import patch, mock_open
 
-from odoo.tests.common import Form, tagged, HttpCase
+from odoo.tests import Form
+from odoo.tests.common import tagged, HttpCase
 from .common import RunbotCase
 
 _logger = logging.getLogger(__name__)