tests: Bluetooth: Mesh: Remove device synchronization API

This API was creating more problems than solving. We should not use back
channel in bsim tests unless there is no other way to communicate
between devices. To synchronize devices we should use k_sleep.

This addresses
#55821

Signed-off-by: Pavel Vasilyev <[email protected]>

Author: PavelVPV

tests/bluetooth/bsim/mesh/src/mesh_test.c

@@ -503,81 +503,6 @@ void bt_mesh_test_ra_cb_setup(void (*cb)(uint8_t *, size_t))
 	ra_cb = cb;
 }
 
-void bt_mesh_test_sync_init(struct bt_mesh_test_sync_ctx *ctx)
-{
-	ctx->chan_id = bs_open_back_channel(get_device_nbr(),
-						  ctx->dev_nmbr,
-						  ctx->chan_nmbr, ctx->cnt);
-}
-
-static bool wait_for_sync(uint32_t channel_id, int *wait, uint8_t msg_len)
-{
-	int size;
-
-	while (true) {
-		size = bs_bc_is_msg_received(channel_id);
-
-		if (size < 0) {
-			FAIL("Sync channel error: %d", size);
-		} else if (size > 0) {
-			ASSERT_EQUAL(size, msg_len);
-			return true;
-		} else if (*wait <= 0) {
-			return false;
-		}
-
-		k_sleep(K_MSEC(100));
-		*wait -= 100;
-	}
-}
-
-bool bt_mesh_test_sync_multi(struct bt_mesh_test_sync_ctx *ctx, uint32_t channel, uint16_t wait_sec)
-{
-	const uint32_t barrier_msg = 0xC0FFEE;
-	uint32_t recv_msg;
-	int wait = wait_sec * MSEC_PER_SEC;
-
-	for (int i = 0; i < ctx->cnt; i++) {
-		if (ctx->chan_nmbr[i] != channel) {
-			continue;
-		}
-
-		if (!wait_for_sync(ctx->chan_id[i], &wait, sizeof(barrier_msg))) {
-			return false;
-		}
-
-		bs_bc_receive_msg(ctx->chan_id[i], (uint8_t *)&recv_msg, sizeof(recv_msg));
-		ASSERT_EQUAL(barrier_msg, recv_msg);
-	}
-
-	for (int i = 0; i < ctx->cnt; i++) {
-		if (ctx->chan_nmbr[i] != channel) {
-			continue;
-		}
-
-		bs_bc_send_msg(ctx->chan_id[i], (uint8_t *)&barrier_msg, sizeof(barrier_msg));
-	}
-
-	return true;
-}
-
-bool bt_mesh_test_sync(uint32_t channel_id, uint16_t wait_sec)
-{
-	const uint32_t barrier_msg = 0xC0FFEE;
-	uint32_t recv_msg;
-	int wait = wait_sec * MSEC_PER_SEC;
-
-	bs_bc_send_msg(channel_id, (uint8_t *)&barrier_msg, sizeof(barrier_msg));
-
-	if (!wait_for_sync(channel_id, &wait, sizeof(barrier_msg))) {
-		return false;
-	}
-
-	bs_bc_receive_msg(channel_id, (uint8_t *)&recv_msg, sizeof(recv_msg));
-	ASSERT_EQUAL(barrier_msg, recv_msg);
-	return true;
-}
-
 uint16_t bt_mesh_test_own_addr_get(uint16_t start_addr)
 {
 	return start_addr + get_device_nbr();

tests/bluetooth/bsim/mesh/src/mesh_test.h

@@ -156,11 +156,6 @@ int bt_mesh_test_send_ra(uint16_t addr, uint8_t *data, size_t len,
 			 void *cb_data);
 void bt_mesh_test_ra_cb_setup(void (*cb)(uint8_t *, size_t));
 
-void bt_mesh_test_sync_init(struct bt_mesh_test_sync_ctx *ctx);
-bool bt_mesh_test_sync_multi(struct bt_mesh_test_sync_ctx *ctx, uint32_t channel,
-			       uint16_t wait_sec);
-bool bt_mesh_test_sync(uint32_t channel_id, uint16_t wait_sec);
-
 uint16_t bt_mesh_test_own_addr_get(uint16_t start_addr);
 
 #if defined(CONFIG_BT_MESH_SAR_CFG)

tests/bluetooth/bsim/mesh/src/test_blob.c

@@ -950,13 +950,6 @@ static void test_srv_trans_complete(void)
 static void test_cli_trans_resume(void)
 {
 	int err;
-	struct bt_mesh_test_sync_ctx sync = {
-		.chan_nmbr = (uint32_t[]){ SYNC_CHAN },
-		.dev_nmbr = (uint32_t[]){ SRV1_DEV },
-		.cnt = 1
-	};
-
-	bt_mesh_test_sync_init(&sync);
 
 	bt_mesh_test_cfg_set(NULL, 800);
 	bt_mesh_device_setup(&prov, &cli_comp);
@@ -1002,8 +995,6 @@ static void test_cli_trans_resume(void)
 
 	ASSERT_TRUE(blob_cli.state == BT_MESH_BLOB_CLI_STATE_SUSPENDED);
 
-	/* Sync with the server device to enable scanning again. */
-	ASSERT_TRUE(bt_mesh_test_sync(sync.chan_id[0], 3));
 	/* Initiate resumption of BLOB transfer */
 	err = bt_mesh_blob_cli_resume(&blob_cli);
 	if (err) {
@@ -1021,14 +1012,6 @@ static void test_cli_trans_resume(void)
 
 static void test_srv_trans_resume(void)
 {
-	struct bt_mesh_test_sync_ctx sync = {
-		.chan_nmbr = (uint32_t[]){ SYNC_CHAN },
-		.dev_nmbr = (uint32_t[]){ 0 },
-		.cnt = 1
-	};
-
-	bt_mesh_test_sync_init(&sync);
-
 	bt_mesh_test_cfg_set(NULL, 800);
 	bt_mesh_device_setup(&prov, &srv_comp);
 	blob_srv_prov_and_conf(bt_mesh_test_own_addr_get(BLOB_CLI_ADDR));
@@ -1059,8 +1042,8 @@ static void test_srv_trans_resume(void)
 
 	ASSERT_TRUE(blob_srv.phase == BT_MESH_BLOB_XFER_PHASE_SUSPENDED);
 
-	/* Wait for BLOB client to suspend */
-	ASSERT_TRUE(bt_mesh_test_sync(sync.chan_id[0], 400));
+	/* Wait for BLOB client to suspend. Measured experimentally. */
+	k_sleep(K_SECONDS(140));
 
 	bt_mesh_scan_enable();
 

tests/bluetooth/bsim/mesh/src/test_transport.c

@@ -152,19 +152,14 @@ static void test_tx_va(void)
 {
 	uint16_t virtual_addr;
 	int err;
-	struct bt_mesh_test_sync_ctx sync = {
-		.chan_nmbr = (uint32_t[]){ SYNC_CHAN },
-		.dev_nmbr = (uint32_t[]){ SRV1_DEV },
-		.cnt = 1
-	};
 
-	bt_mesh_test_sync_init(&sync);
 	bt_mesh_test_setup();
 
 	err = bt_mesh_va_add(test_va_uuid, &virtual_addr);
 	ASSERT_OK_MSG(err, "Virtual addr add failed (err %d)", err);
 
-	ASSERT_TRUE(bt_mesh_test_sync(sync.chan_id[0], 4));
+	/* Wait for the receiver to subscribe on address. */
+	k_sleep(K_SECONDS(1));
 
 	for (int i = 0; i < ARRAY_SIZE(test_vector); i++) {
 		err = bt_mesh_test_send(virtual_addr, test_vector[i].len,
@@ -438,21 +433,13 @@ static void test_rx_va(void)
 	uint16_t virtual_addr;
 	uint8_t status;
 	int err;
-	struct bt_mesh_test_sync_ctx sync = {
-		.chan_nmbr = (uint32_t[]){ SYNC_CHAN },
-		.dev_nmbr = (uint32_t[]){ CLI_DEV },
-		.cnt = 1
-	};
 
-	bt_mesh_test_sync_init(&sync);
 	bt_mesh_test_setup();
 
 	err = bt_mesh_cfg_cli_mod_sub_va_add(0, cfg->addr, cfg->addr, test_va_uuid,
 					 TEST_MOD_ID, &virtual_addr, &status);
 	ASSERT_OK_MSG(err || status, "Sub add failed (err %d, status %u)", err, status);
 
-	ASSERT_TRUE(bt_mesh_test_sync(sync.chan_id[0], 4));
-
 	for (int i = 0; i < ARRAY_SIZE(test_vector); i++) {
 		err = bt_mesh_test_recv(test_vector[i].len, virtual_addr,
 					K_SECONDS(20));