Attachment 119439 Details for Bug 92721 – Fix test cases running client and server dispatch design issue.

[patch] Fix test cases running client and server dispatch design issue.

0002-Fix-test-cases-running-client-and-server-dispatch-de.patch (text/plain), 2.18 KB, created by Ralf Habacker on 2015-11-06 13:11:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2015-11-06 13:11:16 UTC

Size: 2.18 KB

patch

obsolete

>From 4d6e61201b2fa1c1d19acea0b5957604a6dfdeea Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Fri, 6 Nov 2015 14:10:02 +0100
>Subject: [PATCH 2/2] Fix test cases running client and server dispatch design
> issue.
>
>DBus test cases running the server *and* client loop in the same
>process assumed that all messages send from the server has to be
>received in one client dispatch, which is not the case in all
>environments.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=92721
>---
> bus/dispatch.c | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
>diff --git a/bus/dispatch.c b/bus/dispatch.c
>index ae7ac38..4874501 100644
>--- a/bus/dispatch.c
>+++ b/bus/dispatch.c
>@@ -674,9 +674,14 @@ check_service_owner_changed_foreach (DBusConnection *connection,
>   message = pop_message_waiting_for_memory (connection);
>   if (message == NULL)
>     {
>-      _dbus_warn ("Did not receive a message on %p, expecting %s\n",
>-                  connection, "NameOwnerChanged");
>-      goto out;
>+      block_connection_until_message_from_bus (d->context, connection, "NameOwnerChanged");
>+      message = pop_message_waiting_for_memory (connection);
>+      if (message == NULL)
>+        {
>+          _dbus_warn ("Did not receive a message on %p, expecting %s\n",
>+                      connection, "NameOwnerChanged");
>+          goto out;
>+        }
>     }
>   else if (!dbus_message_is_signal (message,
>                                     DBUS_INTERFACE_DBUS,
>@@ -1029,9 +1034,14 @@ check_hello_message (BusContext     *context,
>       message = pop_message_waiting_for_memory (connection);
>       if (message == NULL)
>         {
>-          _dbus_warn ("Expecting %s, got nothing\n",
>+          block_connection_until_message_from_bus (context, connection, "signal NameAcquired");
>+          message = pop_message_waiting_for_memory (connection);
>+          if (message == NULL)
>+            {
>+              _dbus_warn ("Expecting %s, got nothing\n",
>                       "NameAcquired");
>-          goto out;
>+              goto out;
>+            }
>         }
>       if (! dbus_message_is_signal (message, DBUS_INTERFACE_DBUS,
>                                     "NameAcquired"))
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 92721: 119290 | 119291 | 119292 | 119312 | 119313 | 119316 | 119317 | 119341 | 119344 | 119345 | 119346 | 119347 | 119352 | 119353 | 119355 | 119356 | 119357 | 119358 | 119361 | 119362 | 119419 | 119437 | 119438 | 119439 | 119478 | 119479 | 119488 | 119490 | 119491 | 119509 | 119510 | 119522 | 119523 | 119529 | 119530 | 119562 | 119575 | 119576 | 119649 | 119650 | 119651 | 119655 | 119689 | 119710 | 119711 | 119712 | 119713 | 119715 | 119716 | 119725 | 119737 | 119738 | 119739 | 119740 | 120084 | 120171 | 120186

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.