fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-18 11:50:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Ralf Habacker 2015-11-13 19:41:43 +01:00
parent 034b462fd4
commit 19a0c97d55
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bus/dispatch.c
View file

@ -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