Skip to content

Commit 4b41a6f

Browse files
authored
Merge pull request #11915 from AriParkkila/tests-sendtimeout
TESTS: Fix TCP/TLS send_timeout test to non-blocking
2 parents 869df2d + d2f87a1 commit 4b41a6f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

TESTS/netsocket/tcp/tcpsocket_send_timeout.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ void TCPSOCKET_SEND_TIMEOUT()
3333
TEST_FAIL();
3434
return;
3535
}
36+
sock.set_blocking(false);
3637

3738
int err;
3839
Timer timer;
@@ -42,7 +43,7 @@ void TCPSOCKET_SEND_TIMEOUT()
4243
timer.start();
4344
err = sock.send(tx_buffer, sizeof(tx_buffer));
4445
timer.stop();
45-
if ((err == sizeof(tx_buffer)) &&
46+
if ((err == sizeof(tx_buffer) || err == NSAPI_ERROR_WOULD_BLOCK) &&
4647
(timer.read_ms() <= 800)) {
4748
continue;
4849
}

TESTS/netsocket/tls/tlssocket_send_timeout.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ void TLSSOCKET_SEND_TIMEOUT()
3434
TEST_FAIL();
3535
return;
3636
}
37+
sock.set_blocking(false);
3738

3839
int err;
3940
Timer timer;
@@ -43,7 +44,7 @@ void TLSSOCKET_SEND_TIMEOUT()
4344
timer.start();
4445
err = sock.send(tx_buffer, sizeof(tx_buffer));
4546
timer.stop();
46-
if ((err == sizeof(tx_buffer)) &&
47+
if ((err == sizeof(tx_buffer) || err == NSAPI_ERROR_WOULD_BLOCK) &&
4748
(timer.read_ms() <= 800)) {
4849
continue;
4950
}

0 commit comments

Comments
 (0)