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:   Brian Gix <brian.gix@intel.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     brian.gix@intel.com, hj.tedd.an@gmail.com, tedd.an@intel.com
Subject: [PATCH BlueZ] tools: Fix mesh-tester to expect end of ADV
Date:   Tue, 27 Sep 2022 15:55:14 -0700
Message-Id: <20220927225514.278400-1-brian.gix@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Tester was failing by not clearing the HCI queue of expected events
---
 tools/mesh-tester.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tools/mesh-tester.c b/tools/mesh-tester.c
index 6781bd565..d7b3b6f9b 100644
--- a/tools/mesh-tester.c
+++ b/tools/mesh-tester.c
@@ -1345,6 +1345,10 @@ static const uint8_t send_mesh_cancel_2[] = {
 	0x02
 };
 
+static const uint8_t mesh_cancel_rsp_param_mesh[] = {
+	0x00
+};
+
 static const struct generic_data mesh_send_mesh_cancel_1 = {
 	.send_opcode = MGMT_OP_MESH_SEND_CANCEL,
 	.send_param = send_mesh_cancel_1,
@@ -1353,6 +1357,10 @@ static const struct generic_data mesh_send_mesh_cancel_1 = {
 	.expect_alt_ev = MGMT_EV_MESH_PACKET_CMPLT,
 	.expect_alt_ev_param = send_mesh_cancel_1,
 	.expect_alt_ev_len = sizeof(send_mesh_cancel_1),
+
+	.expect_hci_command = BT_HCI_CMD_LE_SET_ADV_ENABLE,
+	.expect_hci_param = mesh_cancel_rsp_param_mesh,
+	.expect_hci_len = sizeof(mesh_cancel_rsp_param_mesh),
 };
 
 static const struct generic_data mesh_send_mesh_cancel_2 = {
@@ -1363,6 +1371,10 @@ static const struct generic_data mesh_send_mesh_cancel_2 = {
 	.expect_alt_ev = MGMT_EV_MESH_PACKET_CMPLT,
 	.expect_alt_ev_param = send_mesh_cancel_2,
 	.expect_alt_ev_len = sizeof(send_mesh_cancel_2),
+
+	.expect_hci_command = BT_HCI_CMD_LE_SET_ADV_ENABLE,
+	.expect_hci_param = mesh_cancel_rsp_param_mesh,
+	.expect_hci_len = sizeof(mesh_cancel_rsp_param_mesh),
 };
 
 static void setup_multi_mesh_send(const void *test_data)
-- 
2.37.3