Attachment 137191 Details for Bug 102839 – [4/5, 1.12 edition] test_connect_to_bus: Allow skipping the use of a DBusLoop

[patch] [4/5, 1.12 edition] test_connect_to_bus: Allow skipping the use of a DBusLoop

0001-test_connect_to_bus-Allow-skipping-the-use-of-a-DBus.patch (text/plain), 1.06 KB, created by Simon McVittie on 2018-02-06 19:20:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2018-02-06 19:20:24 UTC

Size: 1.06 KB

patch

obsolete

>From bd31f268e2531029ca3f3586b0a1a68b8e82171b Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Thu, 1 Feb 2018 19:46:28 +0000
>Subject: [PATCH] test_connect_to_bus: Allow skipping the use of a DBusLoop
>
>DBusLoop isn't thread-safe, so we can't use it to test multi-threaded
>situations.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=102839
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>Reviewed-by: Philip Withnall <withnall@endlessm.com>
>(cherry picked from commit f127c8e110faed76039f96dbc53a87f093fea312)
>[smcv: Adjust for older codebase]
>---
> test/test-utils-glib.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/test/test-utils-glib.c b/test/test-utils-glib.c
>index 9dc58b97..2fc1573d 100644
>--- a/test/test-utils-glib.c
>+++ b/test/test-utils-glib.c
>@@ -332,7 +332,9 @@ test_connect_to_bus (TestMainContext *ctx,
>   g_assert (ok);
>   g_assert (dbus_bus_get_unique_name (conn) != NULL);
> 
>-  test_connection_setup (ctx, conn);
>+  if (ctx != NULL)
>+    test_connection_setup (ctx, conn);
>+
>   return conn;
> }
> 
>-- 
>2.16.1
>

Actions: View | Splinter Review

Attachments on bug 102839: 134315 | 134343 | 134357 | 134467 | 136953 | 136954 | 136955 | 136956 | 136957 | 136959 | 137120 | 137121 | 137122 | 137190 | 137191 | 137200

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.