Skip to content
Snippets Groups Projects
Commit 86ee68da authored by Vincent Hatakeyama's avatar Vincent Hatakeyama
Browse files

:pencil: change back --install option in do_tests

parent b4bd0e14
No related branches found
No related tags found
1 merge request!109📝 change back --install option in do_tests
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
History 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 16.1.0
------ ------
......
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
__version__ = "4.0.1" __version__ = "4.1.0"
__date__ = "2018-04-13" __date__ = "2018-04-13"
...@@ -26,5 +26,5 @@ ...@@ -26,5 +26,5 @@
__date__ = "2018-04-13" __date__ = "2018-04-13"
__updated__ = "2022-04-06" __updated__ = "2022-04-12"
def main(argv=None): # IGNORE:C0111 def main(argv=None): # IGNORE:C0111
...@@ -104,7 +104,12 @@ ...@@ -104,7 +104,12 @@
parser.add_argument( parser.add_argument(
"-i", "-i",
"--install", "--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, default=None,
) )
parser.add_argument( parser.add_argument(
...@@ -156,7 +161,8 @@ ...@@ -156,7 +161,8 @@
recreate_db = nmspc.createdb recreate_db = nmspc.createdb
install_log_level = nmspc.log_level if nmspc.log_level else nmspc.install_log_level 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 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 override_tested_module = nmspc.test
dbport = nmspc.dbport dbport = nmspc.dbport
start_postgresql = nmspc.start_postgresql start_postgresql = nmspc.start_postgresql
...@@ -250,12 +256,10 @@ ...@@ -250,12 +256,10 @@
args.extend(get_build_options(nmspc)) args.extend(get_build_options(nmspc))
module_list = ( module_list = (
override_installed_module.split(",") override_module_list.split(",") if override_module_list else config.module_list
if override_installed_module
else config.module_list
) )
module_list_tests = ( module_list_tests = (
override_tested_module.split(",") override_tested_module.split(",")
if override_tested_module if override_tested_module
else config.module_list_tests else config.module_list_tests
) )
...@@ -256,20 +260,15 @@ ...@@ -256,20 +260,15 @@
) )
module_list_tests = ( module_list_tests = (
override_tested_module.split(",") override_tested_module.split(",")
if override_tested_module if override_tested_module
else config.module_list_tests else config.module_list_tests
) )
if force_install_module:
install_modules = ",".join( install_modules = force_install_module
module for module in module_list if module not in module_list_tests else:
) # only keep modules that will not be tested
tested_non_installed_modules = [ install_modules = ",".join(
module for module in module_list_tests if module not in module_list module for module in module_list if module not in module_list_tests
]
if tested_non_installed_modules:
_logger.error(
"Modules to tests but not in module list: %s",
", ".join(tested_non_installed_modules),
) )
if recreate_db: if recreate_db:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment