diff --git a/mesh/test/mttest/mttest.c b/mesh/test/mttest/mttest.c index 4092f14..d44f8d5 100644 --- a/mesh/test/mttest/mttest.c +++ b/mesh/test/mttest/mttest.c @@ -106,6 +106,7 @@ static void free_current_test(void) pthread_cond_destroy(&m_test_ready_cond); pthread_mutex_destroy(&m_test_ready_mutex); + free(mp_current_test->p_rand_states); free(mp_current_test->p_threads); free(mp_current_test); mp_current_test = NULL; diff --git a/mesh/test/src/ut_access.c b/mesh/test/src/ut_access.c index 0342ebf..1ed1a14 100644 --- a/mesh/test/src/ut_access.c +++ b/mesh/test/src/ut_access.c @@ -403,7 +403,7 @@ static void evt_handler_add_stub(nrf_mesh_evt_handler_t * p_evt_handler, int num static const void * dsm_flash_area_get_stub(int num_calls) { - return (void*) PAGE_SIZE; + return (const void *) (PAGE_SIZE * 10); } static void flash_manager_mem_listener_register_stub(fm_mem_listener_t * p_listener, int num_calls) diff --git a/mesh/test/src/ut_transport.c b/mesh/test/src/ut_transport.c index 4902741..05def8b 100644 --- a/mesh/test/src/ut_transport.c +++ b/mesh/test/src/ut_transport.c @@ -326,7 +326,7 @@ void test_duplicate_sar_tx(void) expect_init(); transport_init(NULL); nrf_mesh_network_secmat_t net_secmat; - nrf_mesh_application_secmat_t app_secmat; + nrf_mesh_application_secmat_t app_secmat = {0}; uint8_t buffer[PACKET_MESH_TRS_SEG_ACCESS_PDU_MAX_SIZE - PACKET_MESH_TRS_TRANSMIC_SMALL_SIZE]; diff --git a/mesh/test/src/ut_transport_lpn.c b/mesh/test/src/ut_transport_lpn.c index cdc13ee..ba2de64 100644 --- a/mesh/test/src/ut_transport_lpn.c +++ b/mesh/test/src/ut_transport_lpn.c @@ -737,6 +737,17 @@ void test_sar_always_room_for_an_rx_in_friendship(void) decrypt_Expect(); TEST_ASSERT_EQUAL(NRF_SUCCESS, transport_packet_in(&packet, sizeof(packet.pdu), &net_metadata, &rx_metadata)); + + /* Cleanup TX contexts by acking all of them */ + + for (uint32_t i = 0; i < TRANSPORT_SAR_SESSIONS_MAX-1; ++i) + { + /* ACK segment -> successful TX. */ + event_handle_StubWithCallback(event_handle_stub); + m_expected_evt.type = NRF_MESH_EVT_TX_COMPLETE; + sar_tx_ctx_free_Expect(); + segack_receive(SEQZERO + i*2, 0x03); + } } /*****************************************************************************