2014-01-20 10:00:07

by Jakub Tyszkowski

Subject: [PATCH 1/2] tester: Remove test timeout for setup failure

If setup fails, timeout function is not removed and still can be called,
causing random subsequent case failure.
---
src/shared/tester.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/src/shared/tester.c b/src/shared/tester.c
index f3edd74..06fc415 100644
--- a/src/shared/tester.c
+++ b/src/shared/tester.c
@@ -460,6 +460,11 @@ void tester_setup_failed(void)
if (test->stage != TEST_STAGE_SETUP)
return;

+ if (test->timeout_id > 0) {
+ g_source_remove(test->timeout_id);
+ test->timeout_id = 0;
+ }
+
print_progress(test->name, COLOR_RED, "setup failed");

g_idle_add(done_callback, test);
--
1.8.5.2

2014-01-20 10:20:42

by Johan Hedberg

Subject: Re: [PATCH 1/2] tester: Remove test timeout for setup failure

Hi Jakub,

On Mon, Jan 20, 2014, Jakub Tyszkowski wrote:
> If setup fails, timeout function is not removed and still can be called,
> causing random subsequent case failure.
> ---
> src/shared/tester.c | 5 +++++
> 1 file changed, 5 insertions(+)

Both patches have been applied. Thanks.

Johan

2014-01-20 10:00:08

by Jakub Tyszkowski

Subject: [PATCH 2/2] android/pan: Initialize GError with NULL

This patch fixes the following issue:

bluetoothd[10552]: android/pan.c:register_nap_server()
bluetoothd[10552]: android/pan.c:nap_create_bridge() bnep
(bluetoothd:10552): GLib-WARNING **: GError set over the top of a previous GError or uninitialized memory.
This indicates a bug in someone's code. You must ensure an error is NULL before it's set.
The overwriting error message was: l2cap_bind: Address already in use (98)
bluetoothd[10552]: android/pan.c:destroy_nap_device()
---
android/pan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/pan.c b/android/pan.c
index dfd7762..3544d74 100644
--- a/android/pan.c
+++ b/android/pan.c
@@ -542,7 +542,7 @@ static void destroy_nap_device(void)

static int register_nap_server(void)
{
- GError *gerr;
+ GError *gerr = NULL;
int err;

DBG("");
--
1.8.5.2