From a259216812fad1f00fceb3d9b1565e533685485b Mon Sep 17 00:00:00 2001 From: Luis Felipe Mileo Date: Mon, 6 Dec 2021 12:09:18 -0300 Subject: [PATCH] [NEW] setup_server db template --- travis/test_server.py | 10 ++++++---- travis/travis_makepot | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/travis/test_server.py b/travis/test_server.py index 8bd0363d6..85ee5fafc 100755 --- a/travis/test_server.py +++ b/travis/test_server.py @@ -210,7 +210,7 @@ def cmd_strip_secret(cmd): def setup_server(db, odoo_unittest, tested_addons, server_path, script_name, - addons_path, install_options, preinstall_modules=None, + addons_path, install_options, setup_dbtemplate, preinstall_modules=None, unbuffer=True, server_options=None): """ Setup the base module before running the tests @@ -222,6 +222,7 @@ def setup_server(db, odoo_unittest, tested_addons, server_path, script_name, :param script_name: name of the main server file :param addons_path: Addons path :param install_options: Install options (travis parameter) + :param setup_dbtemplate: use an alternative database template :param preinstall_modules: (list) Modules that should be preinstalled :param unbuffer: keeps output colors :param server_options: (list) Add these flags to the Odoo server init @@ -232,7 +233,7 @@ def setup_server(db, odoo_unittest, tested_addons, server_path, script_name, server_options = [] print("\nCreating instance:") try: - subprocess.check_call(["createdb", db]) + subprocess.check_call(["createdb", "-T", setup_dbtemplate, db]) except subprocess.CalledProcessError: print("Using previous openerp_template database.") else: @@ -315,6 +316,7 @@ def main(argv=None): data_dir = os.path.expanduser(os.environ.get("DATA_DIR", '~/data_dir')) test_enable = str2bool(os.environ.get('TEST_ENABLE', True)) dbtemplate = os.environ.get('MQT_TEMPLATE_DB', 'openerp_template') + setup_dbtemplate = os.environ.get('SETUP_TEMPLATE_DB', 'template0') database = os.environ.get('MQT_TEST_DB', 'openerp_test') if not odoo_version: # For backward compatibility, take version from parameter @@ -367,8 +369,8 @@ def main(argv=None): os.environ.get('TRAVIS_BUILD_DIR')))) or ['base'] print("Modules to preinstall: %s" % preinstall_modules) setup_server(dbtemplate, odoo_unittest, tested_addons_list, server_path, - script_name, addons_path, install_options, preinstall_modules, - unbuffer, server_options) + script_name, addons_path, install_options, setup_dbtemplate, + preinstall_modules, unbuffer, server_options) # Running tests cmd_odoo_test = ["coverage", "run", diff --git a/travis/travis_makepot b/travis/travis_makepot index 55f1036b5..c5a8fc419 100755 --- a/travis/travis_makepot +++ b/travis/travis_makepot @@ -39,6 +39,7 @@ def main(argv=None, database=None): travis_home = os.environ.get("HOME", "~/") travis_dependencies_dir = os.path.join(travis_home, 'dependencies') travis_build_dir = os.environ.get("TRAVIS_BUILD_DIR", "../..") + setup_dbtemplate = os.environ.get('SETUP_TEMPLATE_DB', 'template0') server_path = os.environ.get("PYTHONPATH") # when installing with pip we don't need if os.environ.get("MQT_DEP", "OCA") == "OCA": @@ -62,7 +63,8 @@ def main(argv=None, database=None): print("\nInitializing db %s to generate .pot for: %s" % (database, addons)) script_name = get_server_script(server_path) setup_server(database, odoo_unittest, addons_list, server_path, - script_name, addons_path, install_options, addons_list) + script_name, addons_path, install_options, setup_dbtemplate, + addons_list) else: print("\nUsing db %s to generate .pot" % (database, ))