Merge pull request #12267 from AriParkkila/fix-udp-tests

0xc0170 · web-flow · commit 49b158bdc333 · 2020-01-17T12:25:33.000Z
Fix UDP socket test cases
diff --git a/TESTS/netsocket/udp/main.cpp b/TESTS/netsocket/udp/main.cpp
@@ -69,12 +69,12 @@ static void _ifup()
 
 #define MESH 3
 #if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH
-    printf("Waiting for GLOBAL_UP\n");
+    tr_info("Waiting for GLOBAL_UP\n");
     while (net->get_connection_status() != NSAPI_STATUS_GLOBAL_UP) {
         ThisThread::sleep_for(500);
     }
 #endif
-    printf("MBED: UDPClient IP address is '%s'\n", address ? address.get_ip_address() : "null");
+    tr_info("MBED: UDPClient IP address is '%s'\n", address ? address.get_ip_address() : "null");
 }
 
 static void _ifdown()
diff --git a/TESTS/netsocket/udp/udpsocket_echotest.cpp b/TESTS/netsocket/udp/udpsocket_echotest.cpp
@@ -99,7 +99,7 @@ void UDPSOCKET_ECHOTEST_impl(bool use_sendto)
             } else if (sent == pkt_s) {
                 packets_sent++;
             } else {
-                tr_error("[Round#%02d - Sender] error, returned %d", s_idx, sent);
+                tr_warn("[Round#%02d - Sender] error, returned %d", s_idx, sent);
                 continue;
             }
 
@@ -113,7 +113,7 @@ void UDPSOCKET_ECHOTEST_impl(bool use_sendto)
                 //Check if received duplicated packet
                 for (unsigned int d_idx = 0; d_idx < PKTS; ++d_idx) {
                     if (pkt_received[d_idx] && d_idx != s_idx && recvd == pkt_sizes[d_idx]) {
-                        printf("[Round#%02d - Receiver] info, received duplicate packet %d\n", s_idx, d_idx);
+                        tr_warn("[Round#%02d - Receiver] info, received duplicate packet %d\n", s_idx, d_idx);
                         received_duplicate_packet = true;
                         break;
                     }
@@ -123,7 +123,7 @@ void UDPSOCKET_ECHOTEST_impl(bool use_sendto)
             if (recvd == pkt_s) {
                 break;
             } else {
-                tr_error("[Round#%02d - Receiver] error, returned %d", s_idx, recvd);
+                tr_warn("[Round#%02d - Receiver] error, returned %d", s_idx, recvd);
             }
         }
 
@@ -206,7 +206,7 @@ void UDPSOCKET_ECHOTEST_NONBLOCK_impl(bool use_sendto)
                 }
                 --retry_cnt;
             } else {
-                tr_error("[Round#%02d - Sender] error, returned %d", s_idx, sent);
+                tr_warn("[Round#%02d - Sender] error, returned %d", s_idx, sent);
                 continue;
             }
 
@@ -227,7 +227,7 @@ void UDPSOCKET_ECHOTEST_NONBLOCK_impl(bool use_sendto)
                     --retry_recv;
                     continue;
                 } else if (recvd < 0) {
-                    tr_error("sock.recvfrom returned %d", recvd);
+                    tr_warn("sock.recvfrom returned %d", recvd);
                     TEST_FAIL();
                     break;
                 } else if (recvd == pkt_s) {
diff --git a/TESTS/netsocket/udp/udpsocket_echotest_burst.cpp b/TESTS/netsocket/udp/udpsocket_echotest_burst.cpp
@@ -116,7 +116,7 @@ void UDPSOCKET_ECHOTEST_BURST()
                 }
             } else if (recvd < 0) {
                 pkg_fail += BURST_PKTS - j; // Assume all the following packets of the burst to be lost
-                tr_error("[%02d] network error %d", i, recvd);
+                tr_warn("[%02d] network error %d", i, recvd);
                 ThisThread::sleep_for(recv_timeout * 1000);
                 recv_timeout *= 2; // Back off,
                 break;
@@ -141,7 +141,7 @@ void UDPSOCKET_ECHOTEST_BURST()
             ok_bursts++;
         } else {
             drop_bad_packets(sock, TIMEOUT);
-            tr_error("[%02d] burst failure, rcv %d", i, bt_total);
+            tr_warn("[%02d] burst failure, rcv %d", i, bt_total);
         }
     }
 
@@ -217,7 +217,7 @@ void UDPSOCKET_ECHOTEST_BURST_NONBLOCK()
                     goto PKT_OK;
                 }
             }
-            tr_error("[bt#%02d] corrupted packet...", i);
+            tr_warn("[bt#%02d] corrupted packet...", i);
             pkg_fail++;
             break;
 PKT_OK:
diff --git a/TESTS/netsocket/udp/udpsocket_open_limit.cpp b/TESTS/netsocket/udp/udpsocket_open_limit.cpp
@@ -49,7 +49,7 @@ void UDPSOCKET_OPEN_LIMIT()
             }
             ret = sock->open(NetworkInterface::get_default_instance());
             if (ret == NSAPI_ERROR_NO_MEMORY || ret == NSAPI_ERROR_NO_SOCKET) {
-                tr_error("[round#%02d] unable to open new socket, error: %d", i, ret);
+                tr_info("[round#%02d] unable to open new socket, error: %d", i, ret);
                 delete sock;
                 break;
             }
diff --git a/TESTS/netsocket/udp/udpsocket_recv_timeout.cpp b/TESTS/netsocket/udp/udpsocket_recv_timeout.cpp
@@ -70,10 +70,10 @@ void UDPSOCKET_RECV_TIMEOUT()
             }
             continue;
         } else if (recvd < 0) {
-            tr_error("[bt#%02d] network error %d", i, recvd);
+            tr_warn("[bt#%02d] network error %d", i, recvd);
             continue;
         } else if (temp_addr != udp_addr) {
-            tr_info("[bt#%02d] packet from wrong address", i);
+            tr_warn("[bt#%02d] packet from wrong address", i);
             continue;
         }
         TEST_ASSERT_EQUAL(DATA_LEN, recvd);
diff --git a/TESTS/network/multihoming/multihoming_udpsocket_echotest.cpp b/TESTS/network/multihoming/multihoming_udpsocket_echotest.cpp
@@ -84,7 +84,7 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST()
                         packets_sent++;
                     }
                     if (sent != pkt_s) {
-                        printf("[Round#%02d - Sender] error, returned %d\n", s_idx, sent);
+                        tr_warn("[Round#%02d - Sender] error, returned %d\n", s_idx, sent);
                         continue;
                     }
                     recvd = sock.recvfrom(NULL, rx_buffer, pkt_s);
@@ -99,8 +99,10 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST()
             // Packet loss up to 30% tolerated
             if (packets_sent > 0) {
                 double loss_ratio = 1 - ((double)packets_recv / (double)packets_sent);
-                printf("Interface %s, packets sent: %d, packets received %d, loss ratio %.2lf\r\n", interface_name[j], packets_sent, packets_recv, loss_ratio);
+                tr_warn("Interface %s, packets sent: %d, packets received %d, loss ratio %.2lf\r\n", interface_name[j], packets_sent, packets_recv, loss_ratio);
                 TEST_ASSERT_DOUBLE_WITHIN(TOLERATED_LOSS_RATIO, EXPECTED_LOSS_RATIO, loss_ratio);
+            } else {
+                TEST_FAIL();
             }
         }
         TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
@@ -177,7 +179,7 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST_NONBLOCK()
                         }
                         --retry_cnt;
                     } else if (sent != pkt_s) {
-                        printf("[Round#%02d - Sender] error, returned %d\n", s_idx, sent);
+                        tr_warn("[Round#%02d - Sender] error, returned %d\n", s_idx, sent);
                         continue;
                     }
                     if (!tx_sem.try_acquire_for(WAIT2RECV_TIMEOUT * 2)) { // RX might wait up to WAIT2RECV_TIMEOUT before recvfrom
@@ -196,7 +198,7 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST_NONBLOCK()
             // Packet loss up to 30% tolerated
             if (packets_sent > 0) {
                 double loss_ratio = 1 - ((double)packets_recv / (double)packets_sent);
-                printf("Interface %s, Packets sent: %d, packets received %d, loss ratio %.2lf\r\n", interface_name[j], packets_sent, packets_recv, loss_ratio);
+                tr_info("Interface %s, Packets sent: %d, packets received %d, loss ratio %.2lf\r\n", interface_name[j], packets_sent, packets_recv, loss_ratio);
                 TEST_ASSERT_DOUBLE_WITHIN(TOLERATED_LOSS_RATIO, EXPECTED_LOSS_RATIO, loss_ratio);
 
 #if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
@@ -209,10 +211,12 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST_NONBLOCK()
                     }
                 }
                 loss_ratio = 1 - ((double)udp_stats[j].recv_bytes / (double)udp_stats[j].sent_bytes);
-                printf("Bytes sent: %d, bytes received %d, loss ratio %.2lf\r\n", udp_stats[j].sent_bytes, udp_stats[j].recv_bytes, loss_ratio);
+                tr_info("Bytes sent: %d, bytes received %d, loss ratio %.2lf\r\n", udp_stats[j].sent_bytes, udp_stats[j].recv_bytes, loss_ratio);
                 TEST_ASSERT_DOUBLE_WITHIN(TOLERATED_LOSS_RATIO, EXPECTED_LOSS_RATIO, loss_ratio);
 
 #endif
+            } else {
+                TEST_FAIL();
             }
         }
         TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
diff --git a/features/cellular/framework/AT/AT_CellularStack.cpp b/features/cellular/framework/AT/AT_CellularStack.cpp
@@ -181,7 +181,7 @@ nsapi_error_t AT_CellularStack::socket_open(nsapi_socket_t *handle, nsapi_protoc
 
     int index = find_socket_index(0);
     if (index == -1) {
-        tr_error("No free sockets!");
+        tr_warn("No free sockets!");
         _socket_mutex.unlock();
         return NSAPI_ERROR_NO_SOCKET;
     }

Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,12 @@ static void _ifup()`
`69`	`69`
`70`	`70`	`#define MESH 3`
`71`	`71`	`#if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH`
`72`		`- printf("Waiting for GLOBAL_UP\n");`
	`72`	`+ tr_info("Waiting for GLOBAL_UP\n");`
`73`	`73`	`while (net->get_connection_status() != NSAPI_STATUS_GLOBAL_UP) {`
`74`	`74`	`ThisThread::sleep_for(500);`
`75`	`75`	`}`
`76`	`76`	`#endif`
`77`		`- printf("MBED: UDPClient IP address is '%s'\n", address ? address.get_ip_address() : "null");`
	`77`	`+ tr_info("MBED: UDPClient IP address is '%s'\n", address ? address.get_ip_address() : "null");`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`static void _ifdown()`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ void UDPSOCKET_ECHOTEST_BURST()`
`116`	`116`	`}`
`117`	`117`	`} else if (recvd < 0) {`
`118`	`118`	`pkg_fail += BURST_PKTS - j; // Assume all the following packets of the burst to be lost`
`119`		`- tr_error("[%02d] network error %d", i, recvd);`
	`119`	`+ tr_warn("[%02d] network error %d", i, recvd);`
`120`	`120`	`ThisThread::sleep_for(recv_timeout * 1000);`
`121`	`121`	`recv_timeout *= 2; // Back off,`
`122`	`122`	`break;`
`@@ -141,7 +141,7 @@ void UDPSOCKET_ECHOTEST_BURST()`
`141`	`141`	`ok_bursts++;`
`142`	`142`	`} else {`
`143`	`143`	`drop_bad_packets(sock, TIMEOUT);`
`144`		`- tr_error("[%02d] burst failure, rcv %d", i, bt_total);`
	`144`	`+ tr_warn("[%02d] burst failure, rcv %d", i, bt_total);`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`
`@@ -217,7 +217,7 @@ void UDPSOCKET_ECHOTEST_BURST_NONBLOCK()`
`217`	`217`	`goto PKT_OK;`
`218`	`218`	`}`
`219`	`219`	`}`
`220`		`- tr_error("[bt#%02d] corrupted packet...", i);`
	`220`	`+ tr_warn("[bt#%02d] corrupted packet...", i);`
`221`	`221`	`pkg_fail++;`
`222`	`222`	`break;`
`223`	`223`	`PKT_OK:`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ void UDPSOCKET_OPEN_LIMIT()`
`49`	`49`	`}`
`50`	`50`	`ret = sock->open(NetworkInterface::get_default_instance());`
`51`	`51`	`if (ret == NSAPI_ERROR_NO_MEMORY \|\| ret == NSAPI_ERROR_NO_SOCKET) {`
`52`		`- tr_error("[round#%02d] unable to open new socket, error: %d", i, ret);`
	`52`	`+ tr_info("[round#%02d] unable to open new socket, error: %d", i, ret);`
`53`	`53`	`delete sock;`
`54`	`54`	`break;`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,10 @@ void UDPSOCKET_RECV_TIMEOUT()`
`70`	`70`	`}`
`71`	`71`	`continue;`
`72`	`72`	`} else if (recvd < 0) {`
`73`		`- tr_error("[bt#%02d] network error %d", i, recvd);`
	`73`	`+ tr_warn("[bt#%02d] network error %d", i, recvd);`
`74`	`74`	`continue;`
`75`	`75`	`} else if (temp_addr != udp_addr) {`
`76`		`- tr_info("[bt#%02d] packet from wrong address", i);`
	`76`	`+ tr_warn("[bt#%02d] packet from wrong address", i);`
`77`	`77`	`continue;`
`78`	`78`	`}`
`79`	`79`	`TEST_ASSERT_EQUAL(DATA_LEN, recvd);`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST()`
`84`	`84`	`packets_sent++;`
`85`	`85`	`}`
`86`	`86`	`if (sent != pkt_s) {`
`87`		`- printf("[Round#%02d - Sender] error, returned %d\n", s_idx, sent);`
	`87`	`+ tr_warn("[Round#%02d - Sender] error, returned %d\n", s_idx, sent);`
`88`	`88`	`continue;`
`89`	`89`	`}`
`90`	`90`	`recvd = sock.recvfrom(NULL, rx_buffer, pkt_s);`
`@@ -99,8 +99,10 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST()`
`99`	`99`	`// Packet loss up to 30% tolerated`
`100`	`100`	`if (packets_sent > 0) {`
`101`	`101`	`double loss_ratio = 1 - ((double)packets_recv / (double)packets_sent);`
`102`		`- printf("Interface %s, packets sent: %d, packets received %d, loss ratio %.2lf\r\n", interface_name[j], packets_sent, packets_recv, loss_ratio);`
	`102`	`+ tr_warn("Interface %s, packets sent: %d, packets received %d, loss ratio %.2lf\r\n", interface_name[j], packets_sent, packets_recv, loss_ratio);`
`103`	`103`	`TEST_ASSERT_DOUBLE_WITHIN(TOLERATED_LOSS_RATIO, EXPECTED_LOSS_RATIO, loss_ratio);`
	`104`	`+ } else {`
	`105`	`+ TEST_FAIL();`
`104`	`106`	`}`
`105`	`107`	`}`
`106`	`108`	`TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());`
`@@ -177,7 +179,7 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST_NONBLOCK()`
`177`	`179`	`}`
`178`	`180`	`--retry_cnt;`
`179`	`181`	`} else if (sent != pkt_s) {`
`180`		`- printf("[Round#%02d - Sender] error, returned %d\n", s_idx, sent);`
	`182`	`+ tr_warn("[Round#%02d - Sender] error, returned %d\n", s_idx, sent);`
`181`	`183`	`continue;`
`182`	`184`	`}`
`183`	`185`	`if (!tx_sem.try_acquire_for(WAIT2RECV_TIMEOUT * 2)) { // RX might wait up to WAIT2RECV_TIMEOUT before recvfrom`
`@@ -196,7 +198,7 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST_NONBLOCK()`
`196`	`198`	`// Packet loss up to 30% tolerated`
`197`	`199`	`if (packets_sent > 0) {`
`198`	`200`	`double loss_ratio = 1 - ((double)packets_recv / (double)packets_sent);`
`199`		`- printf("Interface %s, Packets sent: %d, packets received %d, loss ratio %.2lf\r\n", interface_name[j], packets_sent, packets_recv, loss_ratio);`
	`201`	`+ tr_info("Interface %s, Packets sent: %d, packets received %d, loss ratio %.2lf\r\n", interface_name[j], packets_sent, packets_recv, loss_ratio);`
`200`	`202`	`TEST_ASSERT_DOUBLE_WITHIN(TOLERATED_LOSS_RATIO, EXPECTED_LOSS_RATIO, loss_ratio);`
`201`	`203`
`202`	`204`	`#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED`
`@@ -209,10 +211,12 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST_NONBLOCK()`
`209`	`211`	`}`
`210`	`212`	`}`
`211`	`213`	`loss_ratio = 1 - ((double)udp_stats[j].recv_bytes / (double)udp_stats[j].sent_bytes);`
`212`		`- printf("Bytes sent: %d, bytes received %d, loss ratio %.2lf\r\n", udp_stats[j].sent_bytes, udp_stats[j].recv_bytes, loss_ratio);`
	`214`	`+ tr_info("Bytes sent: %d, bytes received %d, loss ratio %.2lf\r\n", udp_stats[j].sent_bytes, udp_stats[j].recv_bytes, loss_ratio);`
`213`	`215`	`TEST_ASSERT_DOUBLE_WITHIN(TOLERATED_LOSS_RATIO, EXPECTED_LOSS_RATIO, loss_ratio);`
`214`	`216`
`215`	`217`	`#endif`
	`218`	`+ } else {`
	`219`	`+ TEST_FAIL();`
`216`	`220`	`}`
`217`	`221`	`}`
`218`	`222`	`TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ nsapi_error_t AT_CellularStack::socket_open(nsapi_socket_t *handle, nsapi_protoc`
`181`	`181`
`182`	`182`	`int index = find_socket_index(0);`
`183`	`183`	`if (index == -1) {`
`184`		`- tr_error("No free sockets!");`
	`184`	`+ tr_warn("No free sockets!");`
`185`	`185`	`_socket_mutex.unlock();`
`186`	`186`	`return NSAPI_ERROR_NO_SOCKET;`
`187`	`187`	`}`