michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: tests: Remove ATT MTU Exchange from VCS and MICS bsim tests

Browse source 
This patch removes the redundant test case step.
Neither VCS/VCP nor MICS/MICP require ATT MTU to be other than default
23 bytes.

Signed-off-by: Mariusz Skamra <mariusz.skamra@codecoup.pl>
This commit is contained in:
Mariusz Skamra 2022-03-24 09:34:01 +01:00 • committed by Carles Cufí
commit 916a9828a1
2 changed files with 0 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_client_test.c
View file

@ -21,7 +21,6 @@ static struct bt_mics *mics;
static struct bt_mics_included mics_included; static struct bt_mics_included mics_included;
static volatile bool g_bt_init; static volatile bool g_bt_init;
static volatile bool g_is_connected; static volatile bool g_is_connected;
static volatile bool g_mtu_exchanged;
static volatile bool g_discovery_complete; static volatile bool g_discovery_complete;
static volatile bool g_write_complete; static volatile bool g_write_complete;
@ -183,17 +182,6 @@ static struct bt_mics_cb mics_cbs = {
} }
}; };
static void mtu_cb(struct bt_conn *conn, uint8_t err,
struct bt_gatt_exchange_params *params)
{
if (err != 0) {
FAIL("Failed to exchange MTU (%u)\n", err);
return;
}
g_mtu_exchanged = true;
}
static void connected(struct bt_conn *conn, uint8_t err) static void connected(struct bt_conn *conn, uint8_t err)
{ {
char addr[BT_ADDR_LE_STR_LEN]; char addr[BT_ADDR_LE_STR_LEN];
@ -379,7 +367,6 @@ static void test_main(void)
{ {
int err; int err;
uint8_t expected_mute; uint8_t expected_mute;
static struct bt_gatt_exchange_params mtu_params = { .func = mtu_cb };
struct bt_conn *cached_conn; struct bt_conn *cached_conn;
err = bt_enable(bt_ready); err = bt_enable(bt_ready);
@ -401,12 +388,6 @@ static void test_main(void)
printk("Scanning successfully started\n"); printk("Scanning successfully started\n");
WAIT_FOR(g_is_connected); WAIT_FOR(g_is_connected);
err = bt_gatt_exchange_mtu(default_conn, &mtu_params);
if (err != 0) {
FAIL("Failed to exchange MTU %d", err);
}
WAIT_FOR(g_mtu_exchanged);
err = bt_mics_discover(default_conn, &mics); err = bt_mics_discover(default_conn, &mics);
if (err != 0) { if (err != 0) {
FAIL("Failed to discover MICS %d", err); FAIL("Failed to discover MICS %d", err);

22
tests/bluetooth/bsim_bt/bsim_test_audio/src/vcs_client_test.c
View file

@ -21,7 +21,6 @@ static struct bt_vcs *vcs;
static struct bt_vcs_included vcs_included; static struct bt_vcs_included vcs_included;
static volatile bool g_bt_init; static volatile bool g_bt_init;
static volatile bool g_is_connected; static volatile bool g_is_connected;
static volatile bool g_mtu_exchanged;
static volatile bool g_discovery_complete; static volatile bool g_discovery_complete;
static volatile bool g_write_complete; static volatile bool g_write_complete;
@ -257,17 +256,6 @@ static struct bt_vcs_cb vcs_cbs = {
} }
}; };
static void mtu_cb(struct bt_conn *conn, uint8_t err,
struct bt_gatt_exchange_params *params)
{
if (err) {
FAIL("Failed to exchange MTU (%u)\n", err);
return;
}
g_mtu_exchanged = true;
}
static void connected(struct bt_conn *conn, uint8_t err) static void connected(struct bt_conn *conn, uint8_t err)
{ {
char addr[BT_ADDR_LE_STR_LEN]; char addr[BT_ADDR_LE_STR_LEN];
@ -547,9 +535,6 @@ static void test_main(void)
uint8_t expected_volume; uint8_t expected_volume;
uint8_t previous_volume; uint8_t previous_volume;
uint8_t expected_mute; uint8_t expected_mute;
static struct bt_gatt_exchange_params mtu_params = {
.func = mtu_cb,
};
struct bt_conn *cached_conn; struct bt_conn *cached_conn;
err = bt_enable(bt_ready); err = bt_enable(bt_ready);
@ -577,13 +562,6 @@ static void test_main(void)
WAIT_FOR(g_is_connected); WAIT_FOR(g_is_connected);
err = bt_gatt_exchange_mtu(default_conn, &mtu_params);
if (err) {
FAIL("Failed to exchange MTU %d", err);
}
WAIT_FOR(g_mtu_exchanged);
err = bt_vcs_discover(default_conn, &vcs); err = bt_vcs_discover(default_conn, &vcs);
if (err) { if (err) {
FAIL("Failed to discover VCS %d", err); FAIL("Failed to discover VCS %d", err);