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

Merge branch 'bugfix/https_server_test' into 'master'

Browse Source 
https_server: Fix example test failure

See merge request espressif/esp-idf!17653
This commit is contained in:
Mahavir Jain
2022-03-31 11:08:16 +08:00
parent 506768c9fa 8f77caa637
commit 7153f78e20
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,11 +141,13 @@ def test_examples_protocol_https_server_simple(env, extra_data): # type: (tiny_
resp = conn.getresponse() resp = conn.getresponse()
dut1.expect('performing session handshake') dut1.expect('performing session handshake')
got_resp = resp.read().decode('utf-8') got_resp = resp.read().decode('utf-8')
# Close the connection
if got_resp != success_response: if got_resp != success_response:
Utility.console_log('Response obtained does not match with correct response') Utility.console_log('Response obtained does not match with correct response')
raise RuntimeError('Failed to test SSL connection') raise RuntimeError('Failed to test SSL connection')
# Close the connection
conn.close()
Utility.console_log('Checking user callback: Obtaining client certificate...') Utility.console_log('Checking user callback: Obtaining client certificate...')
serial_number = dut1.expect(re.compile(r'serial number(.*)'), timeout=5)[0] serial_number = dut1.expect(re.compile(r'serial number(.*)'), timeout=5)[0]
@@ -158,7 +160,6 @@ def test_examples_protocol_https_server_simple(env, extra_data): # type: (tiny_
Utility.console_log('Correct response obtained') Utility.console_log('Correct response obtained')
Utility.console_log('SSL connection test successful\nClosing the connection') Utility.console_log('SSL connection test successful\nClosing the connection')
conn.close()
if __name__ == '__main__': if __name__ == '__main__':

4
examples/protocols/https_server/simple/main/main.c
View File

@@ -37,7 +37,7 @@ static esp_err_t root_get_handler(httpd_req_t *req)
#if CONFIG_EXAMPLE_ENABLE_HTTPS_USER_CALLBACK #if CONFIG_EXAMPLE_ENABLE_HTTPS_USER_CALLBACK
void print_peer_cert_info(const mbedtls_ssl_context *ssl) static void print_peer_cert_info(const mbedtls_ssl_context *ssl)
{ {
const mbedtls_x509_crt *cert; const mbedtls_x509_crt *cert;
const size_t buf_size = 1024; const size_t buf_size = 1024;
@@ -72,7 +72,7 @@ void print_peer_cert_info(const mbedtls_ssl_context *ssl)
* The config option is found here - Component config → ESP-TLS * The config option is found here - Component config → ESP-TLS
* *
*/ */
void https_server_user_callback(esp_https_server_user_cb_arg_t *user_cb) static void https_server_user_callback(esp_https_server_user_cb_arg_t *user_cb)
{ {
ESP_LOGI(TAG, "User callback invoked!"); ESP_LOGI(TAG, "User callback invoked!");