From 5c23314da19449f88191a34b40c121c459ceb4a3 Mon Sep 17 00:00:00 2001 From: "igor.udot" Date: Fri, 19 Jul 2024 12:28:32 +0800 Subject: [PATCH] fix: apps empty list is not None --- .gitlab/ci/host-test.yml | 12 ++++++------ tools/ci/idf_pytest/plugin.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml index 62fa8feeef..3d93a20510 100644 --- a/.gitlab/ci/host-test.yml +++ b/.gitlab/ci/host-test.yml @@ -314,8 +314,8 @@ test_pytest_qemu: --pytest-apps -m qemu --collect-app-info "list_job_${CI_JOB_NAME_SLUG}.txt" -# --modified-components ${MR_MODIFIED_COMPONENTS} will be fixed with IDFCI-2270 -# --modified-files ${MR_MODIFIED_FILES} + --modified-components ${MR_MODIFIED_COMPONENTS} + --modified-files ${MR_MODIFIED_FILES} - python tools/ci/get_known_failure_cases_file.py - run_cmd pytest --target $IDF_TARGET @@ -344,8 +344,8 @@ test_pytest_linux: --pytest-apps -m host_test --collect-app-info "list_job_${CI_JOB_NAME_SLUG}.txt" -# --modified-components ${MR_MODIFIED_COMPONENTS} will be fixed with IDFCI-2270 -# --modified-files ${MR_MODIFIED_FILES} + --modified-components ${MR_MODIFIED_COMPONENTS} + --modified-files ${MR_MODIFIED_FILES} - python tools/ci/get_known_failure_cases_file.py - run_cmd pytest --target linux @@ -376,8 +376,8 @@ test_pytest_macos: --pytest-apps -m \"host_test and macos_shell\" --collect-app-info "list_job_${CI_JOB_NAME_SLUG}.txt" -# --modified-components ${MR_MODIFIED_COMPONENTS} will be fixed with IDFCI-2270 -# --modified-files ${MR_MODIFIED_FILES} + --modified-components ${MR_MODIFIED_COMPONENTS} + --modified-files ${MR_MODIFIED_FILES} - python tools/ci/get_known_failure_cases_file.py - run_cmd pytest --target linux diff --git a/tools/ci/idf_pytest/plugin.py b/tools/ci/idf_pytest/plugin.py index d88370792b..10e4861498 100644 --- a/tools/ci/idf_pytest/plugin.py +++ b/tools/ci/idf_pytest/plugin.py @@ -82,7 +82,7 @@ class IdfPytestEmbedded: self.apps_list = ( [os.path.join(idf_relpath(app.app_dir), app.build_dir) for app in apps if app.build_status == BuildStatus.SUCCESS] - if apps + if apps is not None else None )