From 542aeee85d1ee5d6cedcaaaa0b5f7ea57a461bd2 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Tue, 11 Apr 2023 21:32:39 -0400 Subject: [PATCH] =?UTF-8?q?[FIX]=C2=A0makefile=20test:=20move=20serial=20t?= =?UTF-8?q?est=20in=20execution=20second=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 ++-- script/test/run_parallel_test.py | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 571fb2e..339717b 100644 --- a/Makefile +++ b/Makefile @@ -622,7 +622,7 @@ test_full_fast: #./script/test/run_parallel_test.py --keep_cache ./script/test/run_parallel_test.py # TODO This test is broken in parallel - ./script/make.sh test_code_generator_hello_world + #./script/make.sh test_code_generator_hello_world .PHONY: test_full_fast_coverage test_full_fast_coverage: @@ -632,7 +632,7 @@ test_full_fast_coverage: ./.venv/bin/coverage erase ./script/test/run_parallel_test.py --coverage # TODO This test is broken in parallel - ./script/make.sh test_coverage_code_generator_hello_world + #./script/make.sh test_coverage_code_generator_hello_world ./.venv/bin/coverage combine -a ./.venv/bin/coverage report -m --include="addons/TechnoLibre_odoo-code-generator/*" ./.venv/bin/coverage html --include="addons/TechnoLibre_odoo-code-generator/*" diff --git a/script/test/run_parallel_test.py b/script/test/run_parallel_test.py index 7891dc1..7ebe5b2 100755 --- a/script/test/run_parallel_test.py +++ b/script/test/run_parallel_test.py @@ -1205,18 +1205,29 @@ def run_all_test(config) -> None: run_code_generator_website_snippet_test(config), run_code_generator_demo_generic_test(config), # End run generic test - # TODO Will cause conflict with the other because write in code_generator_demo/hooks.py - # run_helloworld_test(config), run_code_generator_inherit_test(config), run_demo_test(config), ] + task_second_list = [ + # TODO Will cause conflict with the other because write in code_generator_demo/hooks.py + run_helloworld_test(config), + ] + _logger.info("First list task") lib_asyncio.print_summary_task(task_list) + _logger.info("Second list task") + lib_asyncio.print_summary_task(task_second_list) + _logger.info("First execution") tpl_result = lib_asyncio.execute(config, task_list) + _logger.info("Second execution") + tpl_result_second = lib_asyncio.execute(config, task_second_list) - print_log(task_list, tpl_result) - status = check_result(task_list, tpl_result) + # Extra + tpl_result_total = tpl_result + tpl_result_second + task_list_total = task_list + task_second_list + print_log(task_list_total, tpl_result_total) + status = check_result(task_list_total, tpl_result_total) if status: log_file_print = LOG_FILE else: