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

Merge pull request #11915 from AriParkkila/tests-sendtimeout 

TESTS: Fix TCP/TLS send_timeout test to non-blocking
pull/11928/head
Martin Kojtal 2019-11-22 09:16:11 +01:00 committed by GitHub
parent 869df2d280 d2f87a141d
commit 4b41a6f164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TESTS/netsocket/tcp/tcpsocket_send_timeout.cpp
View File

@ -33,6 +33,7 @@ void TCPSOCKET_SEND_TIMEOUT()
TEST_FAIL(); TEST_FAIL();
return; return;
} }
sock.set_blocking(false);
int err; int err;
Timer timer; Timer timer;
@ -42,7 +43,7 @@ void TCPSOCKET_SEND_TIMEOUT()
timer.start(); timer.start();
err = sock.send(tx_buffer, sizeof(tx_buffer)); err = sock.send(tx_buffer, sizeof(tx_buffer));
timer.stop(); timer.stop();
if ((err == sizeof(tx_buffer)) && if ((err == sizeof(tx_buffer) || err == NSAPI_ERROR_WOULD_BLOCK) &&
(timer.read_ms() <= 800)) { (timer.read_ms() <= 800)) {
continue; continue;
} }

3
TESTS/netsocket/tls/tlssocket_send_timeout.cpp
View File

@ -34,6 +34,7 @@ void TLSSOCKET_SEND_TIMEOUT()
TEST_FAIL(); TEST_FAIL();
return; return;
} }
sock.set_blocking(false);
int err; int err;
Timer timer; Timer timer;
@ -43,7 +44,7 @@ void TLSSOCKET_SEND_TIMEOUT()
timer.start(); timer.start();
err = sock.send(tx_buffer, sizeof(tx_buffer)); err = sock.send(tx_buffer, sizeof(tx_buffer));
timer.stop(); timer.stop();
if ((err == sizeof(tx_buffer)) && if ((err == sizeof(tx_buffer) || err == NSAPI_ERROR_WOULD_BLOCK) &&
(timer.read_ms() <= 800)) { (timer.read_ms() <= 800)) {
continue; continue;
} }