feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'ci/test_example_connect_ap_timeout_4.4' into 'release/v4.4'

Browse Source 
test: fix ethernet iperf and https_server_simple test (4.4)

See merge request espressif/esp-idf!22388
This commit is contained in:
Jiang Jiang Jian
2023-02-24 16:46:43 +08:00
parent 66bc1293aa 0ff5b1f8e8
commit 5479da3191
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/protocols/https_server/simple/example_test.py
View File

@@ -164,11 +164,11 @@ def test_examples_protocol_https_server_simple(env, extra_data): # type: (tiny_
# start test # start test
dut1.start_app() dut1.start_app()
# Parse IP address and port of the server # Parse IP address and port of the server
dut1.expect(re.compile(r'Starting server')) dut1.expect(re.compile(r'Starting server'), timeout=60)
got_port = dut1.expect(re.compile(r'Server listening on port (\d+)'), timeout=30)[0] got_port = dut1.expect(re.compile(r'Server listening on port (\d+)[^\d]'), timeout=30)[0]
Utility.console_log('Waiting to connect with AP') Utility.console_log('Waiting to connect with AP')
got_ip = dut1.expect(re.compile(r'IPv4 address: (\d+\.\d+\.\d+\.\d+)'), timeout=30)[0] got_ip = dut1.expect(re.compile(r'IPv4 address: (\d+\.\d+\.\d+\.\d+)[^\d]'), timeout=30)[0]
# Expected logs # Expected logs
Utility.console_log('Got IP : ' + got_ip) Utility.console_log('Got IP : ' + got_ip)

1
tools/ci/python_packages/idf_iperf_test_util/IperfUtility.py
View File

@@ -301,6 +301,7 @@ class IperfTestUtility(object):
process = subprocess.Popen(['iperf', '-s', '-B', self.pc_nic_ip, process = subprocess.Popen(['iperf', '-s', '-B', self.pc_nic_ip,
'-t', str(TEST_TIME), '-i', '1', '-f', 'm'], '-t', str(TEST_TIME), '-i', '1', '-f', 'm'],
stdout=f, stderr=f) stdout=f, stderr=f)
time.sleep(1)
if bw_limit > 0: if bw_limit > 0:
self.dut.write('iperf -c {} -i 1 -t {} -b {}'.format(self.pc_nic_ip, TEST_TIME, bw_limit)) self.dut.write('iperf -c {} -i 1 -t {} -b {}'.format(self.pc_nic_ip, TEST_TIME, bw_limit))
else: else: