]> granicus.if.org Git - esp-idf/commitdiff
asio: added socket timeout for example tests
authorDavid Cermak <cermak@espressif.com>
Sat, 4 Aug 2018 20:09:34 +0000 (22:09 +0200)
committerDavid Cermak <cermak@espressif.com>
Mon, 6 Aug 2018 20:05:15 +0000 (22:05 +0200)
examples/protocols/asio/chat_client/asio_chat_client_test.py
examples/protocols/asio/chat_server/asio_chat_server_test.py
examples/protocols/asio/tcp_echo_server/asio_tcp_server_test.py
examples/protocols/asio/udp_echo_server/asio_udp_server_test.py

index 5d6af28eef9bbb2fe65d6990be25b4a089f41ccc..f38c3f67327dafa9fd435eca948e0a6e99b1d507 100644 (file)
@@ -34,10 +34,12 @@ def chat_server_sketch(my_ip):
     print("Starting the server on {}".format(my_ip))
     port=2222
     s=socket(AF_INET, SOCK_STREAM)
+    s.settimeout(600)
     s.bind((my_ip, port))
     s.listen(1)
     q,addr=s.accept()
     print("connection accepted")
+    q.settimeout(30)
     q.send(g_msg_to_client)
     data = q.recv(1024)
     # check if received initial empty message
@@ -86,7 +88,7 @@ def test_examples_protocol_asio_chat_client(env, extra_data):
         time.sleep(1)
     print(g_client_response)
     # 6. evaluate host_server received this message
-    if (g_client_response[4:] == test_msg):
+    if (g_client_response[4:7] == test_msg):
         print("PASS: Received correct message")
         pass
     else:
index b5eb71ff6fc1d64e7b0a8a785ce129985bbf122c..9f3e1408b5db1bbf1b07e73720dfea6ede5dcb75 100644 (file)
@@ -40,6 +40,7 @@ def test_examples_protocol_asio_chat_server(env, extra_data):
     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.settimeout(30)
     cli.connect((data[0],80))
     cli.send(test_msg)
     data = cli.recv(1024)
index 6dcffa3a5d2d3ebf46b97310d8bcf0a8be4bf41d..3514bbc2c20204b6f854b5420a0fe94195534f30 100644 (file)
@@ -41,6 +41,7 @@ def test_examples_protocol_asio_tcp_server(env, extra_data):
     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.settimeout(30)
     cli.connect((data[0],80))
     cli.send(test_msg)
     data = cli.recv(1024)
index 642c686ed8df4c2f0070cfaf74c629a6642c869e..7b20b95ca128c06cf44509af44c62f0bf6eb26f0 100644 (file)
@@ -41,6 +41,7 @@ def test_examples_protocol_asio_udp_server(env, extra_data):
     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.settimeout(30)
     cli.connect((data[0], 80))
     cli.send(test_msg)
     data = cli.recv(1024)