From 04342a73f28471b34e494f98c0717de6ba6b0c77 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Wed, 29 Apr 2020 10:41:39 +0800 Subject: [PATCH] Fix some python bugs left before --- tools/build_apps.py | 2 +- tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py | 1 - tools/ci/python_packages/ttfw_idf/CIAssignUnitTest.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/build_apps.py b/tools/build_apps.py index d25a8e279..6a49ab06a 100755 --- a/tools/build_apps.py +++ b/tools/build_apps.py @@ -112,7 +112,7 @@ def main(): try: build_system_class.build(build_info) except BuildError as e: - logging.error(e.message) + logging.error(str(e)) if args.keep_going: failed_builds.append(build_info) else: diff --git a/tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py b/tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py index 284432b9a..367de54dc 100644 --- a/tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py +++ b/tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py @@ -53,7 +53,6 @@ from . import (CaseConfig, SearchCases, GitlabCIJob, console_log) class Group(object): - MAX_EXECUTION_TIME = 30 MAX_CASE = 15 SORT_KEYS = ["env_tag"] diff --git a/tools/ci/python_packages/ttfw_idf/CIAssignUnitTest.py b/tools/ci/python_packages/ttfw_idf/CIAssignUnitTest.py index fc1de8e4c..b7f1502e0 100644 --- a/tools/ci/python_packages/ttfw_idf/CIAssignUnitTest.py +++ b/tools/ci/python_packages/ttfw_idf/CIAssignUnitTest.py @@ -46,7 +46,7 @@ class Group(CIAssignTest.Group): for key in self.filters: if self._get_case_attr(case, key) != self.filters[key]: if key == "tags": - if self._get_case_attr(case, key).issubset(self.filters[key]): + if set(self._get_case_attr(case, key)).issubset(set(self.filters[key])): continue break else: