Skip to content

Commit c263e33

Browse files
Wrong test in function prvTCPSendLoop() (#1043)
* Wrong test in function prvTCPSendLoop() * fix unit tests --------- Co-authored-by: tony-josi-aws <tonyjosi@amazon.com>
1 parent 9abe2d1 commit c263e33

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

source/FreeRTOS_Sockets.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4546,7 +4546,7 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t * pxSocket )
45464546
xBytesLeft -= xByteCount;
45474547
xBytesSent += xByteCount;
45484548

4549-
if( ( xBytesLeft == 0 ) && ( pvBuffer == NULL ) )
4549+
if( ( xBytesLeft == 0 ) || ( pvBuffer == NULL ) )
45504550
{
45514551
/* pvBuffer can be NULL in case TCP zero-copy transmissions are used. */
45524552
break;

test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,6 @@ void test_FreeRTOS_send_ExactSpaceInStreamBuffer( void )
990990
xTaskResumeAll_ExpectAndReturn( pdFALSE );
991991
xIsCallingFromIPTask_ExpectAndReturn( pdFALSE );
992992
xSendEventToIPTask_ExpectAndReturn( eTCPTimerEvent, pdPASS );
993-
xIsCallingFromIPTask_ExpectAndReturn( pdFALSE );
994993

995994
xReturn = FreeRTOS_send( &xSocket, pvBuffer, uxDataLength, xFlags );
996995

@@ -1008,7 +1007,6 @@ void test_FreeRTOS_send_ExactSpaceInStreamBuffer( void )
10081007
uxStreamBufferAdd_ExpectAndReturn( xSocket.u.xTCP.txStream, 0U, pvBuffer, uxDataLength, uxDataLength );
10091008
xIsCallingFromIPTask_ExpectAndReturn( pdFALSE );
10101009
xSendEventToIPTask_ExpectAndReturn( eTCPTimerEvent, pdPASS );
1011-
xIsCallingFromIPTask_ExpectAndReturn( pdFALSE );
10121010
xReturn = FreeRTOS_send( &xSocket, pvBuffer, uxDataLength, xFlags );
10131011

10141012
TEST_ASSERT_EQUAL( uxDataLength, xReturn );
@@ -1044,7 +1042,6 @@ void test_FreeRTOS_send_MoreSpaceInStreamBuffer( void )
10441042
xTaskResumeAll_ExpectAndReturn( pdFALSE );
10451043
xIsCallingFromIPTask_ExpectAndReturn( pdFALSE );
10461044
xSendEventToIPTask_ExpectAndReturn( eTCPTimerEvent, pdPASS );
1047-
xIsCallingFromIPTask_ExpectAndReturn( pdFALSE );
10481045
xReturn = FreeRTOS_send( &xSocket, pvBuffer, uxDataLength, xFlags );
10491046

10501047
TEST_ASSERT_EQUAL( uxDataLength, xReturn );
@@ -1132,7 +1129,6 @@ void test_FreeRTOS_send_LessSpaceInStreamBuffer_EventuallySpaceAvailable( void )
11321129
uxStreamBufferAdd_ExpectAndReturn( xSocket.u.xTCP.txStream, 0U, &pvBuffer[ 80 ], 20, 20 );
11331130
xIsCallingFromIPTask_ExpectAndReturn( pdFALSE );
11341131
xSendEventToIPTask_ExpectAndReturn( eTCPTimerEvent, pdFALSE );
1135-
xTaskCheckForTimeOut_ExpectAnyArgsAndReturn( pdTRUE );
11361132

11371133
xReturn = FreeRTOS_send( &xSocket, pvBuffer, uxDataLength, xFlags );
11381134

@@ -1290,7 +1286,6 @@ void test_FreeRTOS_send_IPTaskWithNULLBuffer_LessSpaceInStreamBuffer( void )
12901286
uxStreamBufferGetSpace_ExpectAndReturn( xSocket.u.xTCP.txStream, uxDataLength - 20 );
12911287
uxStreamBufferAdd_ExpectAndReturn( xSocket.u.xTCP.txStream, 0U, NULL, uxDataLength - 20, uxDataLength - 20 );
12921288
xIsCallingFromIPTask_ExpectAndReturn( pdTRUE );
1293-
xIsCallingFromIPTask_ExpectAndReturn( pdTRUE );
12941289

12951290
xReturn = FreeRTOS_send( &xSocket, NULL, uxDataLength, xFlags );
12961291

@@ -1360,7 +1355,6 @@ void test_FreeRTOS_send_ExactSpaceInStreamBufferInIPTask( void )
13601355
uxStreamBufferAdd_ExpectAndReturn( xSocket.u.xTCP.txStream, 0U, pvBuffer, uxDataLength, uxDataLength );
13611356
xTaskResumeAll_ExpectAndReturn( pdFALSE );
13621357
xIsCallingFromIPTask_ExpectAndReturn( pdTRUE );
1363-
xIsCallingFromIPTask_ExpectAndReturn( pdFALSE );
13641358

13651359
xReturn = FreeRTOS_send( &xSocket, pvBuffer, uxDataLength, xFlags );
13661360

0 commit comments

Comments
 (0)