tests: Bluetooth: Mesh: Set resync offset to 100ms for all mesh tests

Since this becomes de facto a default value for most of our tests, set
it by default.

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

Author: PavelVPV

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

@@ -262,11 +262,6 @@ void bt_mesh_test_setup(void)
 {
 	static struct bt_mesh_prov prov;
 
-	/* Ensure those test devices will not drift more than
-	 * 100ms for each other in emulated time
-	 */
-	tm_set_phy_max_resync_offset(100000);
-
 	net_buf_simple_init(pub.msg, 0);
 	net_buf_simple_init(vnd_pub.msg, 0);
 
@@ -289,6 +284,11 @@ void bt_mesh_test_cfg_set(const struct bt_mesh_test_cfg *my_cfg, int wait_time)
 	bst_ticker_set_next_tick_absolute(wait_time * USEC_PER_SEC);
 	bst_result = In_progress;
 	cfg = my_cfg;
+
+	/* Ensure those test devices will not drift more than
+	 * 100ms for each other in emulated time
+	 */
+	tm_set_phy_max_resync_offset(100000);
 }
 
 static struct bt_mesh_test_msg *blocking_recv(k_timeout_t timeout)

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

@@ -879,8 +879,6 @@ static void test_cli_trans_complete(void)
 {
 	int err;
 
-	tm_set_phy_max_resync_offset(100000);
-
 	bt_mesh_test_cfg_set(NULL, 400);
 	bt_mesh_device_setup(&prov, &cli_comp);
 	blob_cli_prov_and_conf(BLOB_CLI_ADDR);
@@ -923,8 +921,6 @@ static void test_cli_trans_complete(void)
 
 static void test_srv_trans_complete(void)
 {
-	tm_set_phy_max_resync_offset(100000);
-
 	bt_mesh_test_cfg_set(NULL, 400);
 	bt_mesh_device_setup(&prov, &srv_comp);
 	blob_srv_prov_and_conf(bt_mesh_test_own_addr_get(BLOB_CLI_ADDR));
@@ -961,7 +957,6 @@ static void test_cli_trans_resume(void)
 	};
 
 	bt_mesh_test_sync_init(&sync);
-	tm_set_phy_max_resync_offset(100000);
 
 	bt_mesh_test_cfg_set(NULL, 800);
 	bt_mesh_device_setup(&prov, &cli_comp);
@@ -1033,7 +1028,6 @@ static void test_srv_trans_resume(void)
 	};
 
 	bt_mesh_test_sync_init(&sync);
-	tm_set_phy_max_resync_offset(100000);
 
 	bt_mesh_test_cfg_set(NULL, 800);
 	bt_mesh_device_setup(&prov, &srv_comp);
@@ -1090,8 +1084,6 @@ static void test_cli_trans_persistency_pull(void)
 {
 	int err;
 
-	tm_set_phy_max_resync_offset(100000);
-
 	bt_mesh_test_cfg_set(NULL, 240);
 	bt_mesh_device_setup(&prov, &cli_comp);
 	blob_cli_prov_and_conf(BLOB_CLI_ADDR);
@@ -1129,8 +1121,6 @@ static void test_cli_trans_persistency_pull(void)
 
 static void test_srv_trans_persistency_pull(void)
 {
-	tm_set_phy_max_resync_offset(100000);
-
 	bt_mesh_test_cfg_set(NULL, 240);
 	bt_mesh_device_setup(&prov, &srv_comp);
 	blob_srv_prov_and_conf(bt_mesh_test_own_addr_get(BLOB_CLI_ADDR));
@@ -1197,7 +1187,6 @@ static int fail_on_block_start(const struct bt_mesh_blob_io *io,
 
 static void cli_common_fail_on_init(void)
 {
-	tm_set_phy_max_resync_offset(100000);
 	bt_mesh_test_cfg_set(NULL, 800);
 	bt_mesh_device_setup(&prov, &cli_comp);
 	blob_cli_prov_and_conf(BLOB_CLI_ADDR);
@@ -1259,8 +1248,6 @@ static void test_cli_fail_on_persistency(void)
 
 static void common_fail_on_srv_init(const struct bt_mesh_comp *comp)
 {
-	tm_set_phy_max_resync_offset(100000);
-
 	bt_mesh_test_cfg_set(NULL, 800);
 	bt_mesh_device_setup(&prov, comp);
 	blob_srv_prov_and_conf(bt_mesh_test_own_addr_get(BLOB_CLI_ADDR));

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

@@ -658,7 +658,6 @@ static void cli_common_fail_on_init(void)
 {
 	const struct bt_mesh_dfu_slot *slot;
 
-	tm_set_phy_max_resync_offset(100000);
 	settings_test_backend_clear();
 	bt_mesh_test_cfg_set(NULL, 300);
 	bt_mesh_device_setup(&prov, &cli_comp);
@@ -973,8 +972,6 @@ static void test_target_fail_on_nothing(void)
 
 static void test_pre_init(void)
 {
-	tm_set_phy_max_resync_offset(100000);
-
 	k_sem_init(&dfu_dist_ended, 0, 1);
 	k_sem_init(&dfu_ended, 0, 1);
 	k_sem_init(&caps_get_sem, 0, 1);

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

@@ -142,11 +142,6 @@ static bool is_oob_auth;
 
 static void test_device_init(void)
 {
-	/* Ensure those test devices will not drift more than
-	 * 100ms for each other in emulated time
-	 */
-	tm_set_phy_max_resync_offset(100000);
-
 	/* Ensure that the UUID is unique: */
 	dev_uuid[6] = '0' + get_device_nbr();
 
@@ -156,11 +151,6 @@ static void test_device_init(void)
 
 static void test_provisioner_init(void)
 {
-	/* Ensure those test devices will not drift more than
-	 * 100ms for each other in emulated time
-	 */
-	tm_set_phy_max_resync_offset(100000);
-
 	atomic_set_bit(test_flags, IS_PROVISIONER);
 	bt_mesh_test_cfg_set(NULL, WAIT_TIME);
 	k_work_init_delayable(&oob_timer, delayed_input);