| Message ID | 20210503180321.Bluez.1.I462ae10efbf980757258cabcce883b212259a793@changeid (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [Bluez,1/2] unit/gobex: remove timer only when it's not removed yet | expand |
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=476307 ---Test result--- Test Summary: CheckPatch PASS 0.68 seconds GitLint PASS 0.27 seconds Prep - Setup ELL PASS 50.39 seconds Build - Prep PASS 0.11 seconds Build - Configure PASS 8.85 seconds Build - Make PASS 210.42 seconds Make Check PASS 9.36 seconds Make Dist PASS 13.67 seconds Make Dist - Configure PASS 5.55 seconds Make Dist - Make PASS 86.39 seconds Build w/ext ELL - Configure PASS 8.88 seconds Build w/ext ELL - Make PASS 199.24 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 Dist - PASS Desc: Run 'make dist' and build the distribution tarball ############################## Test: Make Dist - Configure - PASS Desc: Configure the source from distribution tarball ############################## Test: Make Dist - Make - PASS Desc: Build the source from distribution tarball ############################## 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
Hi Archie, On Mon, May 3, 2021 at 3:04 AM Archie Pusaka <apusaka@google.com> wrote: > > From: Archie Pusaka <apusaka@chromium.org> > > There are instances where timer is removed because timeout has > occurred, yet we still remove it again by the end of the test. This > causes double removal and prints ugly messages which obscures the > real culprit. > > Reviewed-by: Sonny Sasaka <sonnysasaka@chromium.org> > Reviewed-by: Yun-Hao Chung <howardchung@chromium.org> > --- > > unit/test-gobex.c | 21 ++++++++++++++------- > 1 file changed, 14 insertions(+), 7 deletions(-) > > diff --git a/unit/test-gobex.c b/unit/test-gobex.c > index 6fbfa183ec..25a3646630 100644 > --- a/unit/test-gobex.c > +++ b/unit/test-gobex.c > @@ -266,7 +266,8 @@ static void send_req(GObexPacket *req, GObexResponseFunc rsp_func, > g_main_loop_unref(mainloop); > mainloop = NULL; > > - g_source_remove(timer_id); > + if (!g_error_matches(gerr, TEST_ERROR, TEST_ERROR_TIMEOUT)) > + g_source_remove(timer_id); That is weird way to check if the timer is active, usually the callback shall set the id to 0 and then we check it before removing, and we might want to consider consolidating this code into a function. > g_io_channel_unref(io); > g_obex_unref(obex); > > @@ -450,7 +451,8 @@ static void test_cancel_req_delay(int transport_type) > > g_assert_no_error(r.err); > > - g_source_remove(timer_id); > + if (!g_error_matches(r.err, TEST_ERROR, TEST_ERROR_TIMEOUT)) > + g_source_remove(timer_id); > g_io_channel_unref(io); > g_source_remove(io_id); > g_obex_unref(r.obex); > @@ -551,7 +553,8 @@ static void test_send_connect(int transport_type) > g_main_loop_unref(mainloop); > mainloop = NULL; > > - g_source_remove(timer_id); > + if (!g_error_matches(r.err, TEST_ERROR, TEST_ERROR_TIMEOUT)) > + g_source_remove(timer_id); > g_io_channel_unref(io); > if (!r.completed) > g_source_remove(io_id); > @@ -612,7 +615,8 @@ static void test_recv_unexpected(void) > g_main_loop_unref(mainloop); > mainloop = NULL; > > - g_source_remove(timer_id); > + if (!g_error_matches(err, TEST_ERROR, TEST_ERROR_TIMEOUT)) > + g_source_remove(timer_id); > g_io_channel_unref(io); > g_obex_unref(obex); > > @@ -667,7 +671,8 @@ static void test_send_on_demand(int transport_type, GObexDataProducer func) > g_main_loop_unref(mainloop); > mainloop = NULL; > > - g_source_remove(timer_id); > + if (!g_error_matches(r.err, TEST_ERROR, TEST_ERROR_TIMEOUT)) > + g_source_remove(timer_id); > g_io_channel_unref(io); > if (!r.completed) > g_source_remove(io_id); > @@ -748,7 +753,8 @@ static void recv_connect(int transport_type) > > g_main_loop_run(mainloop); > > - g_source_remove(timer_id); > + if (!g_error_matches(gerr, TEST_ERROR, TEST_ERROR_TIMEOUT)) > + g_source_remove(timer_id); > g_obex_unref(obex); > g_io_channel_unref(io); > > @@ -800,7 +806,8 @@ static void test_disconnect(void) > > g_assert_no_error(gerr); > > - g_source_remove(timer_id); > + if (!g_error_matches(gerr, TEST_ERROR, TEST_ERROR_TIMEOUT)) > + g_source_remove(timer_id); > g_io_channel_unref(io); > g_obex_unref(obex); > > -- > 2.31.1.527.g47e6f16901-goog >
diff --git a/unit/test-gobex.c b/unit/test-gobex.c index 6fbfa183ec..25a3646630 100644 --- a/unit/test-gobex.c +++ b/unit/test-gobex.c @@ -266,7 +266,8 @@ static void send_req(GObexPacket *req, GObexResponseFunc rsp_func, g_main_loop_unref(mainloop); mainloop = NULL; - g_source_remove(timer_id); + if (!g_error_matches(gerr, TEST_ERROR, TEST_ERROR_TIMEOUT)) + g_source_remove(timer_id); g_io_channel_unref(io); g_obex_unref(obex); @@ -450,7 +451,8 @@ static void test_cancel_req_delay(int transport_type) g_assert_no_error(r.err); - g_source_remove(timer_id); + if (!g_error_matches(r.err, TEST_ERROR, TEST_ERROR_TIMEOUT)) + g_source_remove(timer_id); g_io_channel_unref(io); g_source_remove(io_id); g_obex_unref(r.obex); @@ -551,7 +553,8 @@ static void test_send_connect(int transport_type) g_main_loop_unref(mainloop); mainloop = NULL; - g_source_remove(timer_id); + if (!g_error_matches(r.err, TEST_ERROR, TEST_ERROR_TIMEOUT)) + g_source_remove(timer_id); g_io_channel_unref(io); if (!r.completed) g_source_remove(io_id); @@ -612,7 +615,8 @@ static void test_recv_unexpected(void) g_main_loop_unref(mainloop); mainloop = NULL; - g_source_remove(timer_id); + if (!g_error_matches(err, TEST_ERROR, TEST_ERROR_TIMEOUT)) + g_source_remove(timer_id); g_io_channel_unref(io); g_obex_unref(obex); @@ -667,7 +671,8 @@ static void test_send_on_demand(int transport_type, GObexDataProducer func) g_main_loop_unref(mainloop); mainloop = NULL; - g_source_remove(timer_id); + if (!g_error_matches(r.err, TEST_ERROR, TEST_ERROR_TIMEOUT)) + g_source_remove(timer_id); g_io_channel_unref(io); if (!r.completed) g_source_remove(io_id); @@ -748,7 +753,8 @@ static void recv_connect(int transport_type) g_main_loop_run(mainloop); - g_source_remove(timer_id); + if (!g_error_matches(gerr, TEST_ERROR, TEST_ERROR_TIMEOUT)) + g_source_remove(timer_id); g_obex_unref(obex); g_io_channel_unref(io); @@ -800,7 +806,8 @@ static void test_disconnect(void) g_assert_no_error(gerr); - g_source_remove(timer_id); + if (!g_error_matches(gerr, TEST_ERROR, TEST_ERROR_TIMEOUT)) + g_source_remove(timer_id); g_io_channel_unref(io); g_obex_unref(obex);