From 000c2012f38afffd476b43fbf0695886e7381eed Mon Sep 17 00:00:00 2001 From: Pauli Virtanen Date: Sun, 28 May 2023 17:39:13 +0000 Subject: [PATCH] iso-tester: Add tests for AC configuration reconnect Add test for reconnecting a CIG with two CIS, either both with same peer or with different peers. ISO Reconnect AC 6(i) - Success ISO Reconnect AC 6(ii) - Success --- tools/iso-tester.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/tools/iso-tester.c b/tools/iso-tester.c index 63c37bd52..776d87fc1 100644 --- a/tools/iso-tester.c +++ b/tools/iso-tester.c @@ -839,6 +839,15 @@ static const struct iso_client_data connect_ac_6i = { .defer = true, }; +static const struct iso_client_data reconnect_ac_6i = { + .qos = AC_6i_1, + .qos_2 = AC_6i_2, + .expect_err = 0, + .mcis = true, + .defer = true, + .disconnect = true, +}; + static const struct iso_client_data connect_ac_6ii = { .qos = AC_6ii_1, .qos_2 = AC_6ii_2, @@ -847,6 +856,15 @@ static const struct iso_client_data connect_ac_6ii = { .defer = true, }; +static const struct iso_client_data reconnect_ac_6ii = { + .qos = AC_6ii_1, + .qos_2 = AC_6ii_2, + .expect_err = 0, + .mcis = true, + .defer = true, + .disconnect = true, +}; + static const struct iso_client_data connect_ac_7i = { .qos = AC_7i_1, .qos_2 = AC_7i_2, @@ -1626,7 +1644,7 @@ static void iso_send(struct test_data *data, GIOChannel *io) iso_recv(data, io); } -static void setup_connect(struct test_data *data, uint8_t num, GIOFunc func); +static void test_connect(const void *test_data); static gboolean iso_connect_cb(GIOChannel *io, GIOCondition cond, gpointer user_data); @@ -1642,7 +1660,7 @@ static gboolean iso_disconnected(GIOChannel *io, GIOCondition cond, if (data->reconnect) { data->reconnect = false; - setup_connect(data, 0, iso_connect_cb); + test_connect(data->test_data); return FALSE; } @@ -1885,17 +1903,12 @@ static void test_connect(const void *test_data) setup_connect_many(data, n, num, func); } -static void setup_reconnect(struct test_data *data, uint8_t num, GIOFunc func) -{ - data->reconnect = true; - setup_connect(data, num, func); -} - static void test_reconnect(const void *test_data) { struct test_data *data = tester_get_data(); - setup_reconnect(data, 0, iso_connect_cb); + data->reconnect = true; + test_connect(test_data); } static void test_defer(const void *test_data) @@ -2410,6 +2423,14 @@ int main(int argc, char *argv[]) setup_powered, test_connect2_seq); + test_iso2("ISO Reconnect AC 6(i) - Success", &reconnect_ac_6i, + setup_powered, + test_reconnect); + + test_iso2("ISO Reconnect AC 6(ii) - Success", &reconnect_ac_6ii, + setup_powered, + test_reconnect); + test_iso("ISO Broadcaster - Success", &bcast_16_2_1_send, setup_powered, test_bcast); test_iso("ISO Broadcaster Encrypted - Success", &bcast_enc_16_2_1_send, -- 2.47.3