Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To:     linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ] iso-tester: Fix test ISO Connect2 CIG 0x01 - Success/Invalid
Date:   Fri,  4 Aug 2023 14:57:33 -0700
Message-ID: <20230804215733.1049271-1-luiz.dentz@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This test shall succeed rather than fail as this appears to be a bug in
the kernel code preventing Set CIG Parameters to work properly when
there are concurrent tasks only one CIS is being programmed.
---
 tools/iso-tester.c | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/tools/iso-tester.c b/tools/iso-tester.c
index bbf959420488..9b9716e06bdb 100644
--- a/tools/iso-tester.c
+++ b/tools/iso-tester.c
@@ -2402,29 +2402,6 @@ static void test_connect2_seq(const void *test_data)
 	setup_connect(data, 0, iso_connect2_seq_cb);
 }
 
-static void test_connect2_nodefer(const void *test_data)
-{
-	struct test_data *data = tester_get_data();
-	int sk, err;
-
-	/* Second connect() shall fail, because CIG is then busy,
-	 * but the first connect() shall succeed.
-	 */
-	setup_connect(data, 0, iso_connect_cb);
-
-	sk = create_iso_sock(data);
-	if (sk < 0) {
-		tester_test_failed();
-		return;
-	}
-
-	err = connect_iso_sock(data, 1, sk);
-	if (err != -EINVAL)
-		tester_test_failed();
-
-	close(sk);
-}
-
 static gboolean iso_connect_close_cb(GIOChannel *io, GIOCondition cond,
 							gpointer user_data)
 {
@@ -2697,13 +2674,13 @@ int main(int argc, char *argv[])
 	test_iso("ISO Connect Wait Close - Success", &connect_16_2_1,
 					setup_powered, test_connect_wait_close);
 
-	test_iso2("ISO Defer Connect2 CIG 0x01 - Success", &defer_1_16_2_1,
+	test_iso2("ISO Connect2 CIG 0x01 - Success", &connect_1_16_2_1,
 							setup_powered,
 							test_connect2);
 
-	test_iso2("ISO Connect2 CIG 0x01 - Success/Invalid", &connect_1_16_2_1,
+	test_iso2("ISO Defer Connect2 CIG 0x01 - Success", &defer_1_16_2_1,
 							setup_powered,
-							test_connect2_nodefer);
+							test_connect2);
 
 	test_iso("ISO Defer Send - Success", &connect_16_2_1_defer_send,
 							setup_powered,
-- 
2.41.0