2021-05-19 21:20:04

by Stotland, Inga

[permalink] [raw]
Subject: [PATCH BlueZ] tools/mgmt-tester: Fix "Remove Ext Advertising" case

This fixes the expected behavior of the following test case:
"Remove Ext Advertising - Success 1", when the fail status
was erroneously overwritten with success:

<log snip>
New Advertising Removed event received
Test condition complete, 2 left
HCI Command 0x2039 length 6
Invalid parameter size for HCI command
Remove Ext Advertising - Success 1 - test failed
HCI Command 0x203c length 1
HCI Command 0x2039 length 2
Test condition complete, 1 left
Remove Advertising (0x003f): Success (0x00)
Test condition complete, 0 left
Remove Ext Advertising - Success 1 - test passed

The expected HCI command to disable extended advertisement for a
non-zero number of sets should contain the specified number the
advertising sets.
In this particular test case, number of sets is set to 1 and,
as a result, the expected HCI command should be:
"00 | 01 | 01 00 00 00"
disable | number of sets | set info

Also, to avoid false positives/negatives, skip exmination of HCI
commands after the test conditions are met.
---
tools/mgmt-tester.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
index de35008ad..1b9dc0445 100644
--- a/tools/mgmt-tester.c
+++ b/tools/mgmt-tester.c
@@ -6671,7 +6671,7 @@ static void command_hci_callback(uint16_t opcode, const void *param,

tester_print("HCI Command 0x%04x length %u", opcode, length);

- if (opcode != test->expect_hci_command)
+ if (opcode != test->expect_hci_command || data->unmet_conditions <= 0)
return;

if (test->expect_hci_func)
@@ -7720,6 +7720,10 @@ static const char set_ext_adv_disable_param[] = {
0x00, 0x00,
};

+static const char set_ext_adv_disable_param_1[] = {
+ 0x00, 0x01, 0x01, 0x00, 0x00, 0x00
+};
+
static const struct generic_data add_ext_advertising_timeout_expired = {
.expect_alt_ev = MGMT_EV_ADVERTISING_REMOVED,
.expect_alt_ev_param = advertising_instance1_param,
@@ -7747,8 +7751,8 @@ static const struct generic_data remove_ext_advertising_success_1 = {
.expect_alt_ev_param = advertising_instance1_param,
.expect_alt_ev_len = sizeof(advertising_instance1_param),
.expect_hci_command = BT_HCI_CMD_LE_SET_EXT_ADV_ENABLE,
- .expect_hci_param = set_ext_adv_disable_param,
- .expect_hci_len = sizeof(set_ext_adv_disable_param),
+ .expect_hci_param = set_ext_adv_disable_param_1,
+ .expect_hci_len = sizeof(set_ext_adv_disable_param_1),
};

static const struct generic_data remove_ext_advertising_success_2 = {
--
2.26.3



2021-05-19 21:46:11

by bluez.test.bot

[permalink] [raw]
Subject: RE: [BlueZ] tools/mgmt-tester: Fix "Remove Ext Advertising" case

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=485351

---Test result---

Test Summary:
CheckPatch PASS 0.50 seconds
GitLint PASS 0.12 seconds
Prep - Setup ELL PASS 48.33 seconds
Build - Prep PASS 0.11 seconds
Build - Configure PASS 8.50 seconds
Build - Make PASS 206.92 seconds
Make Check PASS 9.88 seconds
Make Distcheck PASS 245.45 seconds
Build w/ext ELL - Configure PASS 8.68 seconds
Build w/ext ELL - Make PASS 194.87 seconds

Details
##############################
Test: CheckPatch - PASS
Desc: Run checkpatch.pl script with rule in .checkpatch.conf

##############################
Test: GitLint - PASS
Desc: Run gitlint with rule in .gitlint

##############################
Test: Prep - Setup ELL - PASS
Desc: Clone, build, and install ELL

##############################
Test: Build - Prep - PASS
Desc: Prepare environment for build

##############################
Test: Build - Configure - PASS
Desc: Configure the BlueZ source tree

##############################
Test: Build - Make - PASS
Desc: Build the BlueZ source tree

##############################
Test: Make Check - PASS
Desc: Run 'make check'

##############################
Test: Make Distcheck - PASS
Desc: Run distcheck to check the distribution

##############################
Test: Build w/ext ELL - Configure - PASS
Desc: Configure BlueZ source with '--enable-external-ell' configuration

##############################
Test: Build w/ext ELL - Make - PASS
Desc: Build BlueZ source with '--enable-external-ell' configuration



---
Regards,
Linux Bluetooth

2021-05-22 00:28:37

by Luiz Augusto von Dentz

[permalink] [raw]
Subject: Re: [BlueZ] tools/mgmt-tester: Fix "Remove Ext Advertising" case

Hi Inga,

On Wed, May 19, 2021 at 2:46 PM <[email protected]> wrote:
>
> This is automated email and please do not reply to this email!
>
> Dear submitter,
>
> Thank you for submitting the patches to the linux bluetooth mailing list.
> This is a CI test results with your patch series:
> PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=485351
>
> ---Test result---
>
> Test Summary:
> CheckPatch PASS 0.50 seconds
> GitLint PASS 0.12 seconds
> Prep - Setup ELL PASS 48.33 seconds
> Build - Prep PASS 0.11 seconds
> Build - Configure PASS 8.50 seconds
> Build - Make PASS 206.92 seconds
> Make Check PASS 9.88 seconds
> Make Distcheck PASS 245.45 seconds
> Build w/ext ELL - Configure PASS 8.68 seconds
> Build w/ext ELL - Make PASS 194.87 seconds
>
> Details
> ##############################
> Test: CheckPatch - PASS
> Desc: Run checkpatch.pl script with rule in .checkpatch.conf
>
> ##############################
> Test: GitLint - PASS
> Desc: Run gitlint with rule in .gitlint
>
> ##############################
> Test: Prep - Setup ELL - PASS
> Desc: Clone, build, and install ELL
>
> ##############################
> Test: Build - Prep - PASS
> Desc: Prepare environment for build
>
> ##############################
> Test: Build - Configure - PASS
> Desc: Configure the BlueZ source tree
>
> ##############################
> Test: Build - Make - PASS
> Desc: Build the BlueZ source tree
>
> ##############################
> Test: Make Check - PASS
> Desc: Run 'make check'
>
> ##############################
> Test: Make Distcheck - PASS
> Desc: Run distcheck to check the distribution
>
> ##############################
> Test: Build w/ext ELL - Configure - PASS
> Desc: Configure BlueZ source with '--enable-external-ell' configuration
>
> ##############################
> Test: Build w/ext ELL - Make - PASS
> Desc: Build BlueZ source with '--enable-external-ell' configuration
>
>
>
> ---
> Regards,
> Linux Bluetooth

Applied, thanks.

--
Luiz Augusto von Dentz