Procházet zdrojové kódy

Merge branch 'bugfix/asio_test_socket_timeout' into 'master'

asio: added socket timeout for example tests

See merge request idf/esp-idf!2931
Ivan Grokhotkov před 7 roky
rodič
revize
48149fa1b1

+ 3 - 1
examples/protocols/asio/chat_client/asio_chat_client_test.py

@@ -34,10 +34,12 @@ def chat_server_sketch(my_ip):
     print("Starting the server on {}".format(my_ip))
     print("Starting the server on {}".format(my_ip))
     port=2222
     port=2222
     s=socket(AF_INET, SOCK_STREAM)
     s=socket(AF_INET, SOCK_STREAM)
+    s.settimeout(600)
     s.bind((my_ip, port))
     s.bind((my_ip, port))
     s.listen(1)
     s.listen(1)
     q,addr=s.accept()
     q,addr=s.accept()
     print("connection accepted")
     print("connection accepted")
+    q.settimeout(30)
     q.send(g_msg_to_client)
     q.send(g_msg_to_client)
     data = q.recv(1024)
     data = q.recv(1024)
     # check if received initial empty message
     # check if received initial empty message
@@ -86,7 +88,7 @@ def test_examples_protocol_asio_chat_client(env, extra_data):
         time.sleep(1)
         time.sleep(1)
     print(g_client_response)
     print(g_client_response)
     # 6. evaluate host_server received this message
     # 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")
         print("PASS: Received correct message")
         pass
         pass
     else:
     else:

+ 1 - 0
examples/protocols/asio/chat_server/asio_chat_server_test.py

@@ -40,6 +40,7 @@ def test_examples_protocol_asio_chat_server(env, extra_data):
     data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
     data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
     # 3. create tcp client and connect to server
     # 3. create tcp client and connect to server
     cli = socket(AF_INET,SOCK_STREAM)
     cli = socket(AF_INET,SOCK_STREAM)
+    cli.settimeout(30)
     cli.connect((data[0],80))
     cli.connect((data[0],80))
     cli.send(test_msg)
     cli.send(test_msg)
     data = cli.recv(1024)
     data = cli.recv(1024)

+ 1 - 0
examples/protocols/asio/tcp_echo_server/asio_tcp_server_test.py

@@ -41,6 +41,7 @@ def test_examples_protocol_asio_tcp_server(env, extra_data):
     data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
     data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
     # 3. create tcp client and connect to server
     # 3. create tcp client and connect to server
     cli = socket(AF_INET,SOCK_STREAM)
     cli = socket(AF_INET,SOCK_STREAM)
+    cli.settimeout(30)
     cli.connect((data[0],80))
     cli.connect((data[0],80))
     cli.send(test_msg)
     cli.send(test_msg)
     data = cli.recv(1024)
     data = cli.recv(1024)

+ 1 - 0
examples/protocols/asio/udp_echo_server/asio_udp_server_test.py

@@ -41,6 +41,7 @@ def test_examples_protocol_asio_udp_server(env, extra_data):
     data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
     data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
     # 3. create tcp client and connect to server
     # 3. create tcp client and connect to server
     cli = socket(AF_INET, SOCK_DGRAM)
     cli = socket(AF_INET, SOCK_DGRAM)
+    cli.settimeout(30)
     cli.connect((data[0], 80))
     cli.connect((data[0], 80))
     cli.send(test_msg)
     cli.send(test_msg)
     data = cli.recv(1024)
     data = cli.recv(1024)