# HG changeset patch # User Vincent Hatakeyama <vincent.hatakeyama@xcg-consulting.fr> # Date 1649752528 -7200 # Tue Apr 12 10:35:28 2022 +0200 # Node ID 86ee68da114d845a406abb3038890d40d80b9409 # Parent b4bd0e14a67d1e8cce098ef92b62d9514ff76fcc 📠change back --install option in do_tests diff --git a/NEWS.rst b/NEWS.rst --- a/NEWS.rst +++ b/NEWS.rst @@ -2,6 +2,11 @@ History ======= +16.2.0 +------ + +Change back option in `do_tests` to keep the same comportment as in version <16.0.0. Override of module_list from configuration file is a new option. + 16.1.0 ------ diff --git a/odoo_scripts/do_tests.py b/odoo_scripts/do_tests.py --- a/odoo_scripts/do_tests.py +++ b/odoo_scripts/do_tests.py @@ -22,9 +22,9 @@ _logger = logging.getLogger(__name__) -__version__ = "4.0.1" +__version__ = "4.1.0" __date__ = "2018-04-13" -__updated__ = "2022-04-06" +__updated__ = "2022-04-12" def main(argv=None): # IGNORE:C0111 @@ -104,7 +104,12 @@ parser.add_argument( "-i", "--install", - help="Modules to install (override defaults from setup.cfg)", + help="Force modules to install", + default=None, + ) + parser.add_argument( + "--module-list", + help="Override module_list from setup.cfg", default=None, ) parser.add_argument( @@ -156,7 +161,8 @@ recreate_db = nmspc.createdb install_log_level = nmspc.log_level if nmspc.log_level else nmspc.install_log_level test_log_level = nmspc.log_level if nmspc.log_level else nmspc.test_log_level - override_installed_module = nmspc.install + override_module_list = nmspc.module_list + force_install_module = nmspc.install override_tested_module = nmspc.test dbport = nmspc.dbport start_postgresql = nmspc.start_postgresql @@ -250,26 +256,19 @@ args.extend(get_build_options(nmspc)) module_list = ( - override_installed_module.split(",") - if override_installed_module - else config.module_list + override_module_list.split(",") if override_module_list else config.module_list ) module_list_tests = ( override_tested_module.split(",") if override_tested_module else config.module_list_tests ) - - install_modules = ",".join( - module for module in module_list if module not in module_list_tests - ) - tested_non_installed_modules = [ - module for module in module_list_tests if module not in module_list - ] - if tested_non_installed_modules: - _logger.error( - "Modules to tests but not in module list: %s", - ", ".join(tested_non_installed_modules), + if force_install_module: + install_modules = force_install_module + else: + # only keep modules that will not be tested + install_modules = ",".join( + module for module in module_list if module not in module_list_tests ) if recreate_db: