This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 6bd38aea404917049a70a98973fda7854eca4299
Author: Szymon Janc <szymon.j...@codecoup.pl>
AuthorDate: Tue Jul 29 13:32:48 2025 +0200
nimble/host: Fix timeout values in tests
Those are in milliseconds and not ticks.
---
nimble/host/test/src/ble_att_svr_test.c | 11 +++++++----
nimble/host/test/src/ble_l2cap_test.c | 12 ++++++++----
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/nimble/host/test/src/ble_att_svr_test.c
b/nimble/host/test/src/ble_att_svr_test.c
index 0a31280dc..c61c7d413 100644
--- a/nimble/host/test/src/ble_att_svr_test.c
+++ b/nimble/host/test/src/ble_att_svr_test.c
@@ -1832,12 +1832,15 @@ TEST_CASE_SELF(ble_att_svr_test_notify)
TEST_CASE_SELF(ble_att_svr_test_prep_write_tmo)
{
int32_t ticks_from_now;
+ uint32_t timeout_ticks;
uint16_t conn_handle;
int rc;
int i;
static uint8_t data[1024];
+ timeout_ticks =
ble_npl_time_ms_to_ticks32(BLE_HS_ATT_SVR_QUEUED_WRITE_TMO);
+
conn_handle = ble_att_svr_test_misc_init(205);
/* Initialize some attribute data. */
@@ -1859,10 +1862,10 @@ TEST_CASE_SELF(ble_att_svr_test_prep_write_tmo)
/* Ensure timer will expire in 30 seconds. */
ticks_from_now = ble_hs_conn_timer();
- TEST_ASSERT(ticks_from_now == BLE_HS_ATT_SVR_QUEUED_WRITE_TMO);
+ TEST_ASSERT(ticks_from_now == timeout_ticks);
/* Almost let the timer expire. */
- os_time_advance(BLE_HS_ATT_SVR_QUEUED_WRITE_TMO - 1);
+ os_time_advance(timeout_ticks - 1);
ticks_from_now = ble_hs_conn_timer();
TEST_ASSERT(ticks_from_now == 1);
@@ -1871,11 +1874,11 @@ TEST_CASE_SELF(ble_att_svr_test_prep_write_tmo)
/* Ensure timer got reset. */
ticks_from_now = ble_hs_conn_timer();
- TEST_ASSERT(ticks_from_now == BLE_HS_ATT_SVR_QUEUED_WRITE_TMO);
+ TEST_ASSERT(ticks_from_now == timeout_ticks);
/* Allow the timer to expire. */
ble_hs_test_util_hci_ack_set_disconnect(0);
- os_time_advance(BLE_HS_ATT_SVR_QUEUED_WRITE_TMO);
+ os_time_advance(timeout_ticks);
ticks_from_now = ble_hs_conn_timer();
TEST_ASSERT(ticks_from_now == BLE_HS_FOREVER);
diff --git a/nimble/host/test/src/ble_l2cap_test.c
b/nimble/host/test/src/ble_l2cap_test.c
index 0f55bc006..d1db844db 100644
--- a/nimble/host/test/src/ble_l2cap_test.c
+++ b/nimble/host/test/src/ble_l2cap_test.c
@@ -415,8 +415,12 @@ TEST_CASE_SELF(ble_l2cap_test_case_frag_channels)
TEST_CASE_SELF(ble_l2cap_test_case_frag_timeout)
{
int32_t ticks_from_now;
+ uint32_t timeout_ticks;
int rc;
+ timeout_ticks =
+ ble_npl_time_ms_to_ticks32(MYNEWT_VAL(BLE_L2CAP_RX_FRAG_TIMEOUT));
+
ble_l2cap_test_util_init();
ble_l2cap_test_util_create_conn(2, ((uint8_t[]){1,2,3,4,5,6}),
@@ -432,10 +436,10 @@ TEST_CASE_SELF(ble_l2cap_test_case_frag_timeout)
/* Ensure timer will expire in 30 seconds. */
ticks_from_now = ble_hs_conn_timer();
- TEST_ASSERT(ticks_from_now == MYNEWT_VAL(BLE_L2CAP_RX_FRAG_TIMEOUT));
+ TEST_ASSERT(ticks_from_now == timeout_ticks);
/* Almost let the timer expire. */
- os_time_advance(MYNEWT_VAL(BLE_L2CAP_RX_FRAG_TIMEOUT) - 1);
+ os_time_advance(timeout_ticks - 1);
ticks_from_now = ble_hs_conn_timer();
TEST_ASSERT(ticks_from_now == 1);
@@ -445,11 +449,11 @@ TEST_CASE_SELF(ble_l2cap_test_case_frag_timeout)
/* Ensure timer got reset. */
ticks_from_now = ble_hs_conn_timer();
- TEST_ASSERT(ticks_from_now == MYNEWT_VAL(BLE_L2CAP_RX_FRAG_TIMEOUT));
+ TEST_ASSERT(ticks_from_now == timeout_ticks);
/* Allow the timer to expire. */
ble_hs_test_util_hci_ack_set_disconnect(0);
- os_time_advance(MYNEWT_VAL(BLE_L2CAP_RX_FRAG_TIMEOUT));
+ os_time_advance(timeout_ticks);
ticks_from_now = ble_hs_conn_timer();
TEST_ASSERT(ticks_from_now == BLE_HS_FOREVER);
