From 323a790f011b6f821b514aa74882876a4696139a Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Thu, 31 Jan 2019 10:12:17 +0800 Subject: [PATCH 1/3] test: fix CI UT job pass even ut app bootup fail --- tools/unit-test-app/unit_test.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/unit-test-app/unit_test.py b/tools/unit-test-app/unit_test.py index 86e352d7f..777d28f9b 100755 --- a/tools/unit-test-app/unit_test.py +++ b/tools/unit-test-app/unit_test.py @@ -293,6 +293,7 @@ def run_unit_test_cases(env, extra_data): failed_cases.append(one_case["name"]) except Exception as e: junit_test_case.add_failure_info("Unexpected exception: " + str(e)) + failed_cases.append(one_case["name"]) finally: TinyFW.JunitReport.test_case_finish(junit_test_case) @@ -420,7 +421,7 @@ def get_dut(duts, env, name, ut_config, app_bin=None): return dut -def run_one_multiple_devices_case(duts, ut_config, env, one_case, failed_cases, app_bin, junit_test_case): +def run_one_multiple_devices_case(duts, ut_config, env, one_case, app_bin, junit_test_case): lock = threading.RLock() threads = [] send_signal_list = [] @@ -442,12 +443,9 @@ def run_one_multiple_devices_case(duts, ut_config, env, one_case, failed_cases, if not thread.result: [thd.stop() for thd in threads] - if result: - Utility.console_log("Success: " + one_case["name"], color="green") - else: - failed_cases.append(one_case["name"]) + if not result: junit_test_case.add_failure_info(output) - Utility.console_log("Failed: " + one_case["name"], color="red") + return result @IDF.idf_unit_test(env_tag="UT_T2_1", junit_report_by_case=True) @@ -478,13 +476,19 @@ def run_multiple_devices_cases(env, extra_data): for ut_config in case_config: Utility.console_log("Running unit test for config: " + ut_config, "O") for one_case in case_config[ut_config]: + result = False junit_test_case = TinyFW.JunitReport.create_test_case("[{}] {}".format(ut_config, one_case["name"])) try: - run_one_multiple_devices_case(duts, ut_config, env, one_case, failed_cases, - one_case.get('app_bin'), junit_test_case) + result = run_one_multiple_devices_case(duts, ut_config, env, one_case, + one_case.get('app_bin'), junit_test_case) except Exception as e: junit_test_case.add_failure_info("Unexpected exception: " + str(e)) finally: + if result: + Utility.console_log("Success: " + one_case["name"], color="green") + else: + failed_cases.append(one_case["name"]) + Utility.console_log("Failed: " + one_case["name"], color="red") TinyFW.JunitReport.test_case_finish(junit_test_case) if failed_cases: @@ -631,6 +635,7 @@ def run_multiple_stage_cases(env, extra_data): failed_cases.append(one_case["name"]) except Exception as e: junit_test_case.add_failure_info("Unexpected exception: " + str(e)) + failed_cases.append(one_case["name"]) finally: TinyFW.JunitReport.test_case_finish(junit_test_case) From 1a9f019d2ac6c9250b428cbf8d161936eaaa7c52 Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Thu, 31 Jan 2019 15:12:31 +0800 Subject: [PATCH 2/3] unit-test-app: increase factory partition size --- tools/unit-test-app/partition_table_unit_test_app.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/unit-test-app/partition_table_unit_test_app.csv b/tools/unit-test-app/partition_table_unit_test_app.csv index 432553f2e..f44968782 100644 --- a/tools/unit-test-app/partition_table_unit_test_app.csv +++ b/tools/unit-test-app/partition_table_unit_test_app.csv @@ -5,7 +5,7 @@ nvs, data, nvs, 0x9000, 0x4000 otadata, data, ota, 0xd000, 0x2000 phy_init, data, phy, 0xf000, 0x1000 -factory, 0, 0, 0x10000, 0x240000 +factory, 0, 0, 0x10000, 0x250000 # these OTA partitions are used for tests, but can't fit real OTA apps in them # (done this way to reduce total flash usage.) ota_0, 0, ota_0, , 64K From 8f3fe52b5a02dcba5eb2bed3f06d761503abc12a Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Wed, 27 Feb 2019 14:32:24 +0800 Subject: [PATCH 3/3] test: temp disable spi master slave mode test --- components/driver/test/test_spi_param.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/driver/test/test_spi_param.c b/components/driver/test/test_spi_param.c index 08facc707..d591cc1a9 100644 --- a/components/driver/test/test_spi_param.c +++ b/components/driver/test/test_spi_param.c @@ -465,9 +465,9 @@ static const ptest_func_t slave_test_func = { .def_param = spitest_def_param, }; -#define TEST_SPI_MASTER_SLAVE(name, param_group) \ +#define TEST_SPI_MASTER_SLAVE(name, param_group, extra_tag) \ PARAM_GROUP_DECLARE(name, param_group) \ - TEST_MASTER_SLAVE(name, param_group, "[spi_ms][test_env=Example_SPI_Multi_device][timeout=120]", &master_test_func, &slave_test_func) + TEST_MASTER_SLAVE(name, param_group, "[spi_ms][test_env=Example_SPI_Multi_device][timeout=120]"#extra_tag, &master_test_func, &slave_test_func) /************ Master Code ***********************************************/ static void test_master_init(void** arg) @@ -789,7 +789,7 @@ static spitest_param_set_t timing_conf[] = { .slave_tv_ns = TV_WITH_ESP_SLAVE_GPIO, }, }; -TEST_SPI_MASTER_SLAVE(TIMING, timing_conf) +TEST_SPI_MASTER_SLAVE(TIMING, timing_conf, "") /************ Mode Test ***********************************************/ #define FREQ_LIMIT_MODE SPI_MASTER_FREQ_16M @@ -976,4 +976,4 @@ spitest_param_set_t mode_conf[] = { .slave_dma_chan = 1, }, }; -TEST_SPI_MASTER_SLAVE(MODE, mode_conf) +TEST_SPI_MASTER_SLAVE(MODE, mode_conf, "[ignore]")