Merge branch 'bugfix/fix_python3_errors_for_ttfw' into 'master'
test: fix python3 errors for ttfw See merge request espressif/esp-idf!7139
This commit is contained in:
commit
91f953eba2
6 changed files with 11 additions and 10 deletions
|
@ -106,6 +106,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
|
||||||
|
@ -453,7 +454,7 @@ UT_034:
|
||||||
|
|
||||||
UT_035:
|
UT_035:
|
||||||
extends: .unit_test_template
|
extends: .unit_test_template
|
||||||
parallel: 31
|
parallel: 22
|
||||||
tags:
|
tags:
|
||||||
- ESP32S2BETA_IDF
|
- ESP32S2BETA_IDF
|
||||||
- UT_T1_1
|
- UT_T1_1
|
||||||
|
|
|
@ -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):
|
||||||
|
|
|
@ -19,7 +19,7 @@ import functools
|
||||||
|
|
||||||
import netifaces
|
import netifaces
|
||||||
|
|
||||||
import EnvConfig
|
from . import EnvConfig
|
||||||
|
|
||||||
|
|
||||||
def _synced(func):
|
def _synced(func):
|
||||||
|
|
|
@ -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):
|
||||||
|
|
|
@ -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, LoadableElfExample, UT # noqa: export all Apps 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
|
from .IDFDUT import IDFDUT, ESP32DUT, ESP32S2DUT, ESP8266DUT, ESP32QEMUDUT # noqa: export DUTs for users
|
||||||
|
|
||||||
|
|
||||||
def format_case_id(chip, case_name):
|
def format_case_id(chip, case_name):
|
||||||
|
|
|
@ -354,7 +354,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")
|
||||||
|
|
Loading…
Reference in a new issue