ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix TCPSOCKET_ENDPOINT_CLOSE: Cannot accept WOULD_BLOCK 

This testcase uses Socket in blocking mode, and therefore
WOULD_BLOCK should not be accepted.
The logic was wrong anyway, because return value was tested
to be negative before testing with WOULD_BLOCK which is negative
as well.

Also replaced TEST_FAIL() macro with TEST_ASSERT_EQUAL() to
make the return code visible in test log.
pull/9429/head
Seppo Takalo 2019-01-18 15:59:35 +02:00
parent 8f48104842
commit 6b92d32b3e
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
TESTS/netsocket/tcp/tcpsocket_endpoint_close.cpp
View File

@ -24,16 +24,6 @@
using namespace utest::v1; using namespace utest::v1;
namespace {
static const int SIGNAL_SIGIO = 0x1;
static const int SIGIO_TIMEOUT = 20000; //[ms]
}
static void _sigio_handler(osThreadId id)
{
osSignalSet(id, SIGNAL_SIGIO);
}
static nsapi_error_t _tcpsocket_connect_to_daytime_srv(TCPSocket &sock) static nsapi_error_t _tcpsocket_connect_to_daytime_srv(TCPSocket &sock)
{ {
SocketAddress tcp_addr; SocketAddress tcp_addr;
@ -49,7 +39,6 @@ static nsapi_error_t _tcpsocket_connect_to_daytime_srv(TCPSocket &sock)
return sock.connect(tcp_addr); return sock.connect(tcp_addr);
} }
void TCPSOCKET_ENDPOINT_CLOSE() void TCPSOCKET_ENDPOINT_CLOSE()
{ {
static const int MORE_THAN_AVAILABLE = 30; static const int MORE_THAN_AVAILABLE = 30;
@ -63,24 +52,16 @@ void TCPSOCKET_ENDPOINT_CLOSE()
TEST_FAIL(); TEST_FAIL();
return; return;
} }
sock.sigio(callback(_sigio_handler, ThisThread::get_id()));
int recvd = 0; int recvd = 0;
int recvd_total = 0; int recvd_total = 0;
while (true) { while (true) {
recvd = sock.recv(&(buff[recvd_total]), MORE_THAN_AVAILABLE); recvd = sock.recv(buff, MORE_THAN_AVAILABLE);
if (recvd_total > 0 && recvd == 0) { if (recvd_total > 0 && recvd == 0) {
break; // Endpoint closed socket, success break; // Endpoint closed socket, success
} else if (recvd <= 0) { } else if (recvd <= 0) {
TEST_FAIL(); TEST_ASSERT_EQUAL(0, recvd);
break; break;
} else if (recvd == NSAPI_ERROR_WOULD_BLOCK) {
if (tc_exec_time.read() >= time_allotted ||
osSignalWait(SIGNAL_SIGIO, SIGIO_TIMEOUT).status == osEventTimeout) {
TEST_FAIL();
break;
}
continue;
} }
recvd_total += recvd; recvd_total += recvd;
TEST_ASSERT(recvd_total < MORE_THAN_AVAILABLE); TEST_ASSERT(recvd_total < MORE_THAN_AVAILABLE);