From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 13 Nov 2015 18:41:43 +0000 (+0100)
Subject: Fix test-bus test for GetConnectionUnixUser driver method on windows.
X-Git-Tag: dbus-1.10.4~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19a0c97d55eab900d31e53eebc062279e548a802;p=thirdparty%2Fdbus.git

Fix test-bus test for GetConnectionUnixUser driver method on windows.

Because GetConnectionUnixUser is not supported on windows it fails with
DBUS_ERROR_FAIL.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92721
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/bus/dispatch.c b/bus/dispatch.c
index c69b48110..e9808162a 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -1277,6 +1277,12 @@ check_get_connection_unix_user (BusContext     *context,
         {
           ; /* good, this is a valid response */
         }
+#ifdef DBUS_WIN
+      else if (dbus_message_is_error (message, DBUS_ERROR_FAILED))
+        {
+          /* this is OK, Unix uids aren't meaningful on Windows */
+        }
+#endif
       else
         {
           warn_unexpected (connection, message, "not this error");
@@ -4837,13 +4843,12 @@ bus_dispatch_test_conf (const DBusString *test_data_dir,
     _dbus_assert_not_reached ("GetAllMatchRules message failed");
 #endif
 
-#ifdef DBUS_WIN_FIXME
-  _dbus_warn("TODO: testing of GetConnectionUnixUser message skipped for now\n");
-  _dbus_warn("TODO: testing of GetConnectionUnixProcessID message skipped for now\n");
-#else
   if (!check_get_connection_unix_user (context, baz))
     _dbus_assert_not_reached ("GetConnectionUnixUser message failed");
 
+#ifdef DBUS_WIN_FIXME
+  _dbus_warn("TODO: testing of GetConnectionUnixProcessID message skipped for now\n");
+#else
   if (!check_get_connection_unix_process_id (context, baz))
     _dbus_assert_not_reached ("GetConnectionUnixProcessID message failed");
 #endif