Merge branch 'bugfix/pppos_app_test_python3' into 'master'

CI: Fix python3 issue on PPPoS app test

Closes IDFCI-251

See merge request espressif/esp-idf!11344
pull/6275/head
Anton Maklakov 2020-11-26 11:12:11 +08:00
commit 01d8782393
4 zmienionych plików z 1 dodań i 6 usunięć

Wyświetl plik

@ -7,9 +7,6 @@
* above. Forgetting this will produce compile-time warnings.
*/
#ifndef IDF_PERFORMANCE_MAX_HTTPS_REQUEST_BIN_SIZE
#define IDF_PERFORMANCE_MAX_HTTPS_REQUEST_BIN_SIZE 900
#endif
#ifndef IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP
#define IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP 200
#endif

Wyświetl plik

@ -143,7 +143,6 @@ def test_app_protocol_mqtt_publish_connect(env, extra_data):
binary_file = os.path.join(dut1.app.binary_path, "mqtt_publish_connect_test.bin")
bin_size = os.path.getsize(binary_file)
ttfw_idf.log_performance("mqtt_publish_connect_test_bin_size", "{}KB".format(bin_size // 1024))
ttfw_idf.check_performance("mqtt_publish_connect_test_bin_size_vin_size", bin_size // 1024, dut1.TARGET)
# Look for test case symbolic names
cases = {}
try:

Wyświetl plik

@ -85,7 +85,6 @@ def test_app_esp_openssl(env, extra_data):
binary_file = os.path.join(dut1.app.binary_path, "openssl_connect_test.bin")
bin_size = os.path.getsize(binary_file)
ttfw_idf.log_performance("openssl_connect_test_bin_size", "{}KB".format(bin_size // 1024))
ttfw_idf.check_performance("openssl_connect_test_bin_size_vin_size", bin_size // 1024, dut1.TARGET)
dut1.start_app()
esp_ip = dut1.expect(re.compile(r" IPv4 address: ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)"), timeout=30)
print("Got IP={}".format(esp_ip[0]))

Wyświetl plik

@ -76,7 +76,7 @@ def test_examples_protocol_pppos_connect(env, extra_data):
af, socktype, proto, canonname, addr = res
sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
sock.connect(addr)
sock.sendall("Espressif")
sock.sendall(b"Espressif")
sock.close()
dut1.expect(re.compile(r"IPv6 test passed"))