From d4ba3bd2eb160c828c76669f533b4b55876e95ea Mon Sep 17 00:00:00 2001 From: Roland Dobai Date: Thu, 25 Oct 2018 11:02:58 +0200 Subject: [PATCH 1/2] idf_ext.py: Fix Python 3 compatibility issue --- tools/unit-test-app/idf_ext.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/unit-test-app/idf_ext.py b/tools/unit-test-app/idf_ext.py index 13a01a311..9bc9ae007 100644 --- a/tools/unit-test-app/idf_ext.py +++ b/tools/unit-test-app/idf_ext.py @@ -141,12 +141,12 @@ def add_action_extensions(base_functions, base_actions): # config folder to build config sdkconfig_default = os.path.join(PROJECT_PATH, "sdkconfig.defaults") - with open(sdkconfig_default, "r") as sdkconfig_default_file: + with open(sdkconfig_default, "rb") as sdkconfig_default_file: sdkconfig_temp.write(sdkconfig_default_file.read()) sdkconfig_config = os.path.join(PROJECT_PATH, "configs", config_name) - with open(sdkconfig_config, "r") as sdkconfig_config_file: - sdkconfig_temp.write("\n") + with open(sdkconfig_config, "rb") as sdkconfig_config_file: + sdkconfig_temp.write(b"\n") sdkconfig_temp.write(sdkconfig_config_file.read()) sdkconfig_temp.flush() @@ -276,4 +276,4 @@ idf.py ut-apply-config-NAME - Generates configuration based on configs/NAME in s extensions["ut-help"] = (ut_help, [], []) - base_actions.update(extensions) \ No newline at end of file + base_actions.update(extensions) From e77d15042d9b64f935a1518bb9ec875b9b8067be Mon Sep 17 00:00:00 2001 From: Roland Dobai Date: Thu, 25 Oct 2018 11:58:49 +0200 Subject: [PATCH 2/2] CI: Update Python 3 ignore list --- tools/ci/setup_python.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/ci/setup_python.sh b/tools/ci/setup_python.sh index 6f8ece1d7..296d00735 100644 --- a/tools/ci/setup_python.sh +++ b/tools/ci/setup_python.sh @@ -1,7 +1,9 @@ #! /bin/bash # Regexp for matching job names which are incompatible with Python 3 -py3_incomp='assign_test|UT|IT' +# - assign_test, nvs_compatible_test, IT - auto_test_script causes the incompatibility +# - UT_009_ - RS485 multi-device test is not started properly +py3_incomp='assign_test|nvs_compatible_test|IT|UT_009_' if [ -z ${PYTHON_VER+x} ] || [[ $CI_JOB_NAME =~ $py3_incomp ]]; then # Use this version of the Python interpreter if it was not defined before or