[PATCH 1/2] android/tester: Fix tester setup result set

[PATCH 1/2] android/tester: Fix tester setup result set

[Grzegorz Kolodziejczyk]

Tester setup result is set to pass after set to fail because of missing
function return. This adds return from function after setting of setup
result to fail.
---
 android/android-tester.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/android-tester.c b/android/android-tester.c
index 9605c4d..618efde 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -2024,6 +2024,7 @@ static void setup_base(const void *test_data)
 	if (status != BT_STATUS_SUCCESS) {
 		data->if_bluetooth = NULL;
 		tester_setup_failed();
+		return;
 	}
 
 	tester_setup_complete();
-- 
1.8.5.2

[PATCH 2/2] android/tester: Fix Discovery Stop - Success test case

[Grzegorz Kolodziejczyk]

This removes start discovery returned status check what derives double
check of expected status. Returned status should be only checked for cancel
discovery.
---
 android/android-tester.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/android/android-tester.c b/android/android-tester.c
index 618efde..baa0115 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -2405,15 +2405,13 @@ static bool pre_inq_compl_hook(const void *dummy, uint16_t len, void *user_data)
 static void test_discovery_stop_success(const void *test_data)
 {
 	struct test_data *data = tester_get_data();
-	bt_status_t status;
 
 	init_test_conditions(data);
 
 	hciemu_add_hook(data->hciemu, HCIEMU_HOOK_PRE_EVT, BT_HCI_CMD_INQUIRY,
 					pre_inq_compl_hook, data);
 
-	status = data->if_bluetooth->start_discovery();
-	check_expected_status(status);
+	data->if_bluetooth->start_discovery();
 }
 
 static void test_discovery_start_done(const void *test_data)
-- 
1.8.5.2

Re: [PATCH 1/2] android/tester: Fix tester setup result set

[Szymon Janc]

Hi Grzegorz,

On Friday 21 of February 2014 12:33:13 Grzegorz Kolodziejczyk wrote:
> Tester setup result is set to pass after set to fail because of missing
> function return. This adds return from function after setting of setup
> result to fail.
> ---
>  android/android-tester.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/android/android-tester.c b/android/android-tester.c
> index 9605c4d..618efde 100644
> --- a/android/android-tester.c
> +++ b/android/android-tester.c
> @@ -2024,6 +2024,7 @@ static void setup_base(const void *test_data)
>  	if (status != BT_STATUS_SUCCESS) {
>  		data->if_bluetooth = NULL;
>  		tester_setup_failed();
> +		return;
>  	}
>  
>  	tester_setup_complete();
> 

Both patches applied, thanks.

-- 
Best regards, 
Szymon Janc