Merge branch 'bugfix/asio_test_timeout' into 'master'

tiny-test-fw: Increase default expect timeout, increase asio example test timeouts

See merge request idf/esp-idf!2925
This commit is contained in:
Jiang Jiang Jian 2018-08-05 00:20:48 +08:00
commit b674fa0b99
5 changed files with 5 additions and 5 deletions

View File

@ -75,7 +75,7 @@ def test_examples_protocol_asio_chat_client(env, extra_data):
thread1.start()
# 2. start the dut test and wait till client gets IP address
dut1.start_app()
data = dut1.expect(re.compile(r" sta ip: ([^,]+),"))
data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
# 3. send host's IP to the client i.e. the `dut1`
dut1.write(host_ip)
# 4. client `dut1` should receive a message

View File

@ -37,7 +37,7 @@ def test_examples_protocol_asio_chat_server(env, extra_data):
# 1. start test
dut1.start_app()
# 2. get the server IP address
data = dut1.expect(re.compile(r" sta ip: ([^,]+),"))
data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
# 3. create tcp client and connect to server
cli = socket(AF_INET,SOCK_STREAM)
cli.connect((data[0],80))

View File

@ -38,7 +38,7 @@ def test_examples_protocol_asio_tcp_server(env, extra_data):
# 1. start test
dut1.start_app()
# 2. get the server IP address
data = dut1.expect(re.compile(r" sta ip: ([^,]+),"))
data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
# 3. create tcp client and connect to server
cli = socket(AF_INET,SOCK_STREAM)
cli.connect((data[0],80))

View File

@ -38,7 +38,7 @@ def test_examples_protocol_asio_udp_server(env, extra_data):
# 1. start test
dut1.start_app()
# 2. get the server IP address
data = dut1.expect(re.compile(r" sta ip: ([^,]+),"))
data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
# 3. create tcp client and connect to server
cli = socket(AF_INET, SOCK_DGRAM)
cli.connect((data[0], 80))

View File

@ -259,7 +259,7 @@ class BaseDUT(object):
:param kwargs: extra args for DUT to create ports
"""
DEFAULT_EXPECT_TIMEOUT = 5
DEFAULT_EXPECT_TIMEOUT = 10
MAX_EXPECT_FAILURES_TO_SAVED = 10
LOG_THREAD = _LogThread()