Attachment 95949 Details for Bug 68892 – tp_list_connection_managers_async: terminate properly if there is no CM

[patch] tp_list_connection_managers_async: terminate properly if there is no CM

0002-tp_list_connection_managers_async-terminate-properly.patch (text/plain), 3.92 KB, created by Guillaume Desmottes on 2014-03-17 15:49:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2014-03-17 15:49:26 UTC

Size: 3.92 KB

patch

obsolete

>From d6faff7fb641d29a369a3381c43d0e565e9eff74 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Mon, 17 Mar 2014 16:45:07 +0100
>Subject: [PATCH 2/2] tp_list_connection_managers_async: terminate properly if
> there is no CM
>
>Fix fdo#68892.
>---
> telepathy-glib/connection-manager.c |  6 +++
> tests/dbus/Makefile.am              |  3 ++
> tests/dbus/list-cm-no-cm.c          | 82 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 91 insertions(+)
> create mode 100644 tests/dbus/list-cm-no-cm.c
>
>diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
>index 34b3889..2d7fe73 100644
>--- a/telepathy-glib/connection-manager.c
>+++ b/telepathy-glib/connection-manager.c
>@@ -1918,6 +1918,12 @@ tp_list_connection_managers_got_names (TpDBusDaemon *bus_daemon,
>       DEBUG ("Total of %" G_GSIZE_FORMAT " CMs to be prepared",
>           list_context->cms_to_ready);
> 
>+      if (list_context->cms_to_ready == 0)
>+        {
>+          all_cms_prepared (list_context);
>+          return;
>+        }
>+
>       for (i = 0; i < list_context->cms_to_ready; i++)
>         {
>           TpConnectionManager *cm = g_ptr_array_index (list_context->arr, i);
>diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
>index 0476442..71f974c 100644
>--- a/tests/dbus/Makefile.am
>+++ b/tests/dbus/Makefile.am
>@@ -45,6 +45,7 @@ tests_list = \
>     test-handle-repo \
>     test-handle-set \
>     test-invalidated-while-invoking-signals \
>+    test-list-cm-no-cm \
>     test-long-connection-name \
>     test-message-mixin \
>     test-params-cm \
>@@ -130,6 +131,8 @@ test_cli_group_SOURCES = cli-group.c
> 
> test_cm_SOURCES = cm.c
> 
>+test_list_cm_no_cm_SOURCES = list-cm-no-cm.c
>+
> test_connection_SOURCES = connection.c
> 
> test_contact_lists_SOURCES = contact-lists.c
>diff --git a/tests/dbus/list-cm-no-cm.c b/tests/dbus/list-cm-no-cm.c
>new file mode 100644
>index 0000000..0ae5727
>--- /dev/null
>+++ b/tests/dbus/list-cm-no-cm.c
>@@ -0,0 +1,82 @@
>+/* Feature test for https://bugs.freedesktop.org/show_bug.cgi?id=68892
>+ *
>+ * Copyright (C) 2014 Collabora Ltd. <http://www.collabora.co.uk/>
>+ *
>+ * Copying and distribution of this file, with or without modification,
>+ * are permitted in any medium without royalty provided the copyright
>+ * notice and this notice are preserved.
>+ */
>+
>+#include "config.h"
>+
>+#include <telepathy-glib/telepathy-glib.h>
>+
>+#include "tests/lib/util.h"
>+
>+typedef struct {
>+  GMainLoop *mainloop;
>+  TpDBusDaemon *dbus;
>+  GError *error;
>+} Test;
>+
>+static void
>+setup (Test *test,
>+       gconstpointer data)
>+{
>+  tp_debug_set_flags ("all");
>+
>+  test->mainloop = g_main_loop_new (NULL, FALSE);
>+  test->dbus = tp_tests_dbus_daemon_dup_or_die ();
>+
>+  test->error = NULL;
>+}
>+
>+static void
>+teardown (Test *test,
>+          gconstpointer data)
>+{
>+  g_clear_object (&test->dbus);
>+  g_main_loop_unref (test->mainloop);
>+  test->mainloop = NULL;
>+}
>+
>+static void
>+test_list_cm_no_cm (Test *test,
>+    gconstpointer data)
>+{
>+  GAsyncResult *res = NULL;
>+  GList *cms;
>+
>+  tp_list_connection_managers_async (test->dbus, tp_tests_result_ready_cb,
>+      &res);
>+  tp_tests_run_until_result (&res);
>+  cms = tp_list_connection_managers_finish (res, &test->error);
>+  g_assert_no_error (test->error);
>+  g_assert_cmpuint (g_list_length (cms), ==, 0);
>+
>+  g_object_unref (res);
>+  g_list_free (cms);
>+}
>+
>+int
>+main (int argc,
>+      char **argv)
>+{
>+  gchar *dir;
>+  GError *error = NULL;
>+
>+  /* This test relies on D-Bus not finding any service file so tweak
>+   * TP_TESTS_SERVICES_DIR to point to an empty directory. */
>+  dir = g_dir_make_tmp ("tp-glib-tests.XXXXXX", &error);
>+  g_assert_no_error (error);
>+  g_setenv ("TP_TESTS_SERVICES_DIR", dir, TRUE);
>+  g_free (dir);
>+
>+  tp_tests_init (&argc, &argv);
>+  g_test_bug_base ("http://bugs.freedesktop.org/show_bug.cgi?id=");
>+
>+  g_test_add ("/cm/list-cm-no-cm", Test, NULL, setup, test_list_cm_no_cm,
>+      teardown);
>+
>+  return tp_tests_run_with_bus ();
>+}
>-- 
>1.8.5.3
>

Actions: View | Splinter Review

Attachments on bug 68892: 95948 | 95949

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.