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

Merge branch 'ci/ota_example_bluedroid_gatts_timeout_v5.0' into 'release/v5.0'

Browse Source 
CI: modify timeout of advanced_https_ota_example_bluedroid_gatts (v5.0)

See merge request espressif/esp-idf!19689
This commit is contained in:
Mahavir Jain
2022-08-23 14:32:45 +08:00
parent d609f5fb35 18e9879908
commit 052ef42e0a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/system/ota/advanced_https_ota/pytest_advanced_ota.py
View File

@ -129,7 +129,7 @@ def test_examples_protocol_advanced_https_ota_example(dut: Dut) -> None:
print('writing to device: {}'.format('https://' + host_ip + ':' + str(server_port) + '/' + bin_name)) print('writing to device: {}'.format('https://' + host_ip + ':' + str(server_port) + '/' + bin_name))
dut.write('https://' + host_ip + ':' + str(server_port) + '/' + bin_name) dut.write('https://' + host_ip + ':' + str(server_port) + '/' + bin_name)
dut.expect('upgrade successful. Rebooting ...', timeout=60) dut.expect('upgrade successful. Rebooting ...', timeout=150)
finally: finally:
thread1.terminate() thread1.terminate()
@ -383,7 +383,7 @@ def test_examples_protocol_advanced_https_ota_example_chunked(dut: Dut) -> None:
dut.expect('Starting Advanced OTA example', timeout=30) dut.expect('Starting Advanced OTA example', timeout=30)
print('writing to device: {}'.format('https://' + host_ip + ':8070/' + bin_name)) print('writing to device: {}'.format('https://' + host_ip + ':8070/' + bin_name))
dut.write('https://' + host_ip + ':8070/' + bin_name) dut.write('https://' + host_ip + ':8070/' + bin_name)
dut.expect('upgrade successful. Rebooting ...', timeout=60) dut.expect('upgrade successful. Rebooting ...', timeout=150)
# after reboot # after reboot
dut.expect('Loaded app from partition at offset', timeout=30) dut.expect('Loaded app from partition at offset', timeout=30)
dut.expect('OTA example app_main start', timeout=10) dut.expect('OTA example app_main start', timeout=10)
@ -437,7 +437,7 @@ def test_examples_protocol_advanced_https_ota_example_redirect_url(dut: Dut) ->
try: try:
print('writing to device: {}'.format('https://' + host_ip + ':' + str(redirection_server_port) + '/' + bin_name)) print('writing to device: {}'.format('https://' + host_ip + ':' + str(redirection_server_port) + '/' + bin_name))
dut.write('https://' + host_ip + ':' + str(redirection_server_port) + '/' + bin_name) dut.write('https://' + host_ip + ':' + str(redirection_server_port) + '/' + bin_name)
dut.expect('upgrade successful. Rebooting ...', timeout=60) dut.expect('upgrade successful. Rebooting ...', timeout=150)
# after reboot # after reboot
dut.expect('Loaded app from partition at offset', timeout=30) dut.expect('Loaded app from partition at offset', timeout=30)
dut.expect('OTA example app_main start', timeout=10) dut.expect('OTA example app_main start', timeout=10)
@ -612,7 +612,7 @@ def test_examples_protocol_advanced_https_ota_example_nimble_gatts(dut: Dut) ->
print('Started GAP advertising.') print('Started GAP advertising.')
dut.write('https://' + host_ip + ':' + str(server_port) + '/' + bin_name) dut.write('https://' + host_ip + ':' + str(server_port) + '/' + bin_name)
dut.expect('upgrade successful. Rebooting ...', timeout=60) dut.expect('upgrade successful. Rebooting ...', timeout=150)
# after reboot # after reboot
dut.expect('Loaded app from partition at offset', timeout=30) dut.expect('Loaded app from partition at offset', timeout=30)
dut.expect('OTA example app_main start', timeout=10) dut.expect('OTA example app_main start', timeout=10)
@ -665,7 +665,7 @@ def test_examples_protocol_advanced_https_ota_example_bluedroid_gatts(dut: Dut)
print('Started GAP advertising.') print('Started GAP advertising.')
dut.write('https://' + host_ip + ':' + str(server_port) + '/' + bin_name) dut.write('https://' + host_ip + ':' + str(server_port) + '/' + bin_name)
dut.expect('upgrade successful. Rebooting ...', timeout=60) dut.expect('upgrade successful. Rebooting ...', timeout=150)
# after reboot # after reboot
dut.expect('Loaded app from partition at offset', timeout=30) dut.expect('Loaded app from partition at offset', timeout=30)
dut.expect('OTA example app_main start', timeout=10) dut.expect('OTA example app_main start', timeout=10)
@ -716,7 +716,7 @@ def test_examples_protocol_advanced_https_ota_example_openssl_aligned_bin(dut: D
dut.expect('Starting Advanced OTA example', timeout=30) dut.expect('Starting Advanced OTA example', timeout=30)
print('writing to device: {}'.format('https://' + host_ip + ':8070/' + aligned_bin_name)) print('writing to device: {}'.format('https://' + host_ip + ':8070/' + aligned_bin_name))
dut.write('https://' + host_ip + ':8070/' + aligned_bin_name) dut.write('https://' + host_ip + ':8070/' + aligned_bin_name)
dut.expect('upgrade successful. Rebooting ...', timeout=60) dut.expect('upgrade successful. Rebooting ...', timeout=150)
# after reboot # after reboot
dut.expect('Loaded app from partition at offset', timeout=30) dut.expect('Loaded app from partition at offset', timeout=30)
dut.expect('OTA example app_main start', timeout=10) dut.expect('OTA example app_main start', timeout=10)

2
examples/system/ota/pre_encrypted_ota/pytest_pre_encrypted_ota.py
View File

@ -77,7 +77,7 @@ def test_examples_protocol_pre_encrypted_ota_example(dut: Dut) -> None:
dut.write('https://' + host_ip + ':' + str(server_port) + '/' + enc_bin_name) dut.write('https://' + host_ip + ':' + str(server_port) + '/' + enc_bin_name)
dut.expect('Magic Verified', timeout=30) dut.expect('Magic Verified', timeout=30)
dut.expect('Reading RSA private key', timeout=30) dut.expect('Reading RSA private key', timeout=30)
dut.expect('upgrade successful. Rebooting', timeout=30) dut.expect('upgrade successful. Rebooting', timeout=60)
# after reboot # after reboot
dut.expect('Loaded app from partition at offset', timeout=30) dut.expect('Loaded app from partition at offset', timeout=30)
finally: finally: