diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index a83506f56d..8a4ab5b7cc 100644 --- a/tools/ci/config/target-test.yml +++ b/tools/ci/config/target-test.yml @@ -68,6 +68,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 @@ -222,7 +223,7 @@ example_test_009: UT_001: extends: .unit_test_template - parallel: 29 + parallel: 28 tags: - ESP32_IDF - UT_T1_1 @@ -232,7 +233,7 @@ UT_001: UT_002: extends: .unit_test_template - parallel: 10 + parallel: 9 tags: - ESP32_IDF - UT_T1_1 @@ -368,12 +369,6 @@ UT_033: - UT_T2_Ethernet - psram -UT_034: - extends: .unit_test_template - tags: - - ESP32_IDF - - UT_T1_ESP_FLASH - UT_035: extends: .unit_test_template tags: diff --git a/tools/ci/python_packages/tiny_test_fw/DUT.py b/tools/ci/python_packages/tiny_test_fw/DUT.py index 71007d85b0..7c23711653 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 c6a9fb9ab3..c4769e6d93 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 f5ef7e1e69..6e2d03d38e 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 001da23095..a7c777194f 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, UT -from IDFDUT import IDFDUT +from .IDFApp import IDFApp, Example, UT # noqa: export all Apps for users +from .IDFDUT import IDFDUT # noqa: export DUTs for users def format_case_id(chip, case_name): diff --git a/tools/unit-test-app/unit_test.py b/tools/unit-test-app/unit_test.py index 6028f6f809..97ec069607 100755 --- a/tools/unit-test-app/unit_test.py +++ b/tools/unit-test-app/unit_test.py @@ -344,7 +344,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")