From 8df08de486b2f7c8aa20b2041094c13f02303641 Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Fri, 27 Dec 2019 17:58:36 +0800 Subject: [PATCH 1/4] ttfw: fix incorrect relative import for python3 --- tools/ci/python_packages/tiny_test_fw/DUT.py | 2 +- tools/ci/python_packages/tiny_test_fw/Env.py | 2 +- tools/ci/python_packages/tiny_test_fw/TinyFW.py | 8 ++++---- tools/ci/python_packages/ttfw_idf/__init__.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/ci/python_packages/tiny_test_fw/DUT.py b/tools/ci/python_packages/tiny_test_fw/DUT.py index c5139c628..b9b91e8ec 100644 --- a/tools/ci/python_packages/tiny_test_fw/DUT.py +++ b/tools/ci/python_packages/tiny_test_fw/DUT.py @@ -53,7 +53,7 @@ except ImportError: import serial from serial.tools import list_ports -import Utility +from . import Utility class ExpectTimeout(ValueError): diff --git a/tools/ci/python_packages/tiny_test_fw/Env.py b/tools/ci/python_packages/tiny_test_fw/Env.py index 3f99c9aac..ac30833c8 100644 --- a/tools/ci/python_packages/tiny_test_fw/Env.py +++ b/tools/ci/python_packages/tiny_test_fw/Env.py @@ -19,7 +19,7 @@ import functools import netifaces -import EnvConfig +from . import EnvConfig def _synced(func): diff --git a/tools/ci/python_packages/tiny_test_fw/TinyFW.py b/tools/ci/python_packages/tiny_test_fw/TinyFW.py index f5ef7e1e6..6e2d03d38 100644 --- a/tools/ci/python_packages/tiny_test_fw/TinyFW.py +++ b/tools/ci/python_packages/tiny_test_fw/TinyFW.py @@ -22,10 +22,10 @@ from datetime import datetime import junit_xml -import Env -import DUT -import App -import Utility +from . import Env +from . import DUT +from . import App +from . import Utility class DefaultEnvConfig(object): diff --git a/tools/ci/python_packages/ttfw_idf/__init__.py b/tools/ci/python_packages/ttfw_idf/__init__.py index 8d7f4df63..f03cc71f9 100644 --- a/tools/ci/python_packages/ttfw_idf/__init__.py +++ b/tools/ci/python_packages/ttfw_idf/__init__.py @@ -15,8 +15,8 @@ import os import re from tiny_test_fw import TinyFW, Utility -from IDFApp import IDFApp, Example, LoadableElfExample, UT # noqa: export all Apps for users -from IDFDUT import IDFDUT, ESP32DUT, ESP32S2DUT, ESP8266DUT, ESP32QEMUDUT # noqa: export DUTs for users +from .IDFApp import IDFApp, Example, LoadableElfExample, UT # noqa: export all Apps for users +from .IDFDUT import IDFDUT, ESP32DUT, ESP32S2DUT, ESP8266DUT, ESP32QEMUDUT # noqa: export DUTs for users def format_case_id(chip, case_name): From f63e91b950e056771a70f615b5c8a288a9166dad Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Fri, 27 Dec 2019 19:25:14 +0800 Subject: [PATCH 2/4] test: let unit test jobs use python3 --- tools/ci/config/target-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index 3e169f97a..2baac8f2b 100644 --- a/tools/ci/config/target-test.yml +++ b/tools/ci/config/target-test.yml @@ -106,6 +106,7 @@ CONFIG_FILE_PATH: "${CI_PROJECT_DIR}/components/idf_test/unit_test/CIConfigs" LOG_PATH: "$CI_PROJECT_DIR/TEST_LOGS" ENV_FILE: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/EnvConfig.yml" + PYTHON_VER: 3 .test_template: stage: target_test From 07f186a6a53aaf51830327c4e06754bc53e725ea Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Sat, 28 Dec 2019 13:59:13 +0800 Subject: [PATCH 3/4] CI: reduce number of unit test jobs --- tools/ci/config/target-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index 2baac8f2b..a4137958e 100644 --- a/tools/ci/config/target-test.yml +++ b/tools/ci/config/target-test.yml @@ -454,7 +454,7 @@ UT_034: UT_035: extends: .unit_test_template - parallel: 31 + parallel: 22 tags: - ESP32S2BETA_IDF - UT_T1_1 From 269af21ce63bf06c6b8b09f3de289a8b1f53f7fd Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Mon, 30 Dec 2019 10:41:11 +0800 Subject: [PATCH 4/4] test: fix multiple devices cases fail on python3 --- tools/unit-test-app/unit_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/unit-test-app/unit_test.py b/tools/unit-test-app/unit_test.py index 3d5e4fe77..f78692667 100755 --- a/tools/unit-test-app/unit_test.py +++ b/tools/unit-test-app/unit_test.py @@ -354,7 +354,7 @@ class Handler(threading.Thread): def device_wait_action(data): start_time = time.time() - expected_signal = data[0] + expected_signal = data[0].encode('utf-8') while 1: if time.time() > start_time + self.timeout: Utility.console_log("Timeout in device for function: %s" % self.child_case_name, color="orange")