espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 04:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_python3_errors_for_ttfw_v4.0' into 'release/v4.0'

Browse Source 
test: fix python3 errors for ttfw (backport v4.0)

See merge request espressif/esp-idf!7146
This commit is contained in:
Ivan Grokhotkov
2019-12-31 17:56:37 +08:00
parent e5d25fb51e dae4da07c3
commit cb1d440cb8
6 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/ci/config/target-test.yml
View File

@@ -68,6 +68,7 @@
CONFIG_FILE_PATH: "${CI_PROJECT_DIR}/components/idf_test/unit_test/CIConfigs" CONFIG_FILE_PATH: "${CI_PROJECT_DIR}/components/idf_test/unit_test/CIConfigs"
LOG_PATH: "$CI_PROJECT_DIR/TEST_LOGS" LOG_PATH: "$CI_PROJECT_DIR/TEST_LOGS"
ENV_FILE: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/EnvConfig.yml" ENV_FILE: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/EnvConfig.yml"
PYTHON_VER: 3
.test_template: .test_template:
stage: target_test stage: target_test
@@ -222,7 +223,7 @@ example_test_009:
UT_001: UT_001:
extends: .unit_test_template extends: .unit_test_template
parallel: 29 parallel: 28
tags: tags:
- ESP32_IDF - ESP32_IDF
- UT_T1_1 - UT_T1_1
@@ -232,7 +233,7 @@ UT_001:
UT_002: UT_002:
extends: .unit_test_template extends: .unit_test_template
parallel: 10 parallel: 9
tags: tags:
- ESP32_IDF - ESP32_IDF
- UT_T1_1 - UT_T1_1
@@ -368,12 +369,6 @@ UT_033:
- UT_T2_Ethernet - UT_T2_Ethernet
- psram - psram
UT_034:
extends: .unit_test_template
tags:
- ESP32_IDF
- UT_T1_ESP_FLASH
UT_035: UT_035:
extends: .unit_test_template extends: .unit_test_template
tags: tags:

2
tools/ci/python_packages/tiny_test_fw/DUT.py
View File

@@ -53,7 +53,7 @@ except ImportError:
import serial import serial
from serial.tools import list_ports from serial.tools import list_ports
import Utility from . import Utility
class ExpectTimeout(ValueError): class ExpectTimeout(ValueError):

2
tools/ci/python_packages/tiny_test_fw/Env.py
View File

@@ -19,7 +19,7 @@ import functools
import netifaces import netifaces
import EnvConfig from . import EnvConfig
def _synced(func): def _synced(func):

8
tools/ci/python_packages/tiny_test_fw/TinyFW.py
View File

@@ -22,10 +22,10 @@ from datetime import datetime
import junit_xml import junit_xml
import Env from . import Env
import DUT from . import DUT
import App from . import App
import Utility from . import Utility
class DefaultEnvConfig(object): class DefaultEnvConfig(object):

4
tools/ci/python_packages/ttfw_idf/__init__.py
View File

@@ -15,8 +15,8 @@ import os
import re import re
from tiny_test_fw import TinyFW, Utility from tiny_test_fw import TinyFW, Utility
from IDFApp import IDFApp, Example, UT from .IDFApp import IDFApp, Example, UT # noqa: export all Apps for users
from IDFDUT import IDFDUT from .IDFDUT import IDFDUT # noqa: export DUTs for users
def format_case_id(chip, case_name): def format_case_id(chip, case_name):

2
tools/unit-test-app/unit_test.py
View File

@@ -344,7 +344,7 @@ class Handler(threading.Thread):
def device_wait_action(data): def device_wait_action(data):
start_time = time.time() start_time = time.time()
expected_signal = data[0] expected_signal = data[0].encode('utf-8')
while 1: while 1:
if time.time() > start_time + self.timeout: if time.time() > start_time + self.timeout:
Utility.console_log("Timeout in device for function: %s" % self.child_case_name, color="orange") Utility.console_log("Timeout in device for function: %s" % self.child_case_name, color="orange")