diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2015-11-13 19:41:43 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2015-11-13 23:02:45 +0100 |
| commit | 19a0c97d55eab900d31e53eebc062279e548a802 (patch) | |
| tree | d6ac21aeea7d9ed54010534b97c43468f38bb122 | |
| parent | 034b462fd409d9bb10cd26250385aaa316c9ffd5 (diff) | |
| download | dbus-19a0c97d55eab900d31e53eebc062279e548a802.tar.gz | |
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>
| -rw-r--r-- | bus/dispatch.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/bus/dispatch.c b/bus/dispatch.c index c69b4811..e9808162 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 |