fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-20 17:30:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 16839: Fix bus names in test case so it actually works.

Browse source 
* test/name-test/test-privserver.c (filter_session_message, main),
* test/name-test/test-privserver-client.c (open_shutdown_private_connection):
 Replace TestServer with PrivServer to match the service definition files.
This commit is contained in:
Scott James Remnant 2008-07-24 16:19:14 -04:00 • committed by Colin Walters
parent 458c6ead85
commit 4cbc30465e
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/name-test/test-privserver-client.c
View file

@ -46,9 +46,9 @@ open_shutdown_private_connection (dbus_bool_t use_guid)
if (!session)
die ("couldn't access session bus\n");
dbus_connection_set_exit_on_disconnect (session, FALSE);
msg = dbus_message_new_method_call ("org.freedesktop.DBus.TestSuite.TestServer",
msg = dbus_message_new_method_call ("org.freedesktop.DBus.TestSuite.PrivServer",
"/",
"org.freedesktop.DBus.TestSuite.TestServer",
"org.freedesktop.DBus.TestSuite.PrivServer",
"GetPrivateAddress");
if (!(reply = dbus_connection_send_with_reply_and_block (session, msg, -1, &error)))
die ("couldn't send message: %s\n", error.message);
@ -73,9 +73,9 @@ open_shutdown_private_connection (dbus_bool_t use_guid)
dbus_connection_add_filter (privconn, filter_private_message, loop, NULL);
test_connection_setup (loop, privconn);
msg = dbus_message_new_method_call ("org.freedesktop.DBus.TestSuite.TestServer",
msg = dbus_message_new_method_call ("org.freedesktop.DBus.TestSuite.PrivServer",
"/",
"org.freedesktop.DBus.TestSuite.TestServer",
"org.freedesktop.DBus.TestSuite.PrivServer",
"Quit");
if (!dbus_connection_send (session, msg, NULL))
die ("couldn't send Quit message\n");

6
test/name-test/test-privserver.c
View file

@ -37,7 +37,7 @@ filter_session_message (DBusConnection *connection,
TestServiceData *testdata = user_data;
if (dbus_message_is_method_call (message,
"org.freedesktop.DBus.TestSuite.TestServer",
"org.freedesktop.DBus.TestSuite.PrivServer",
"GetPrivateAddress"))
{
DBusMessage *reply;
@ -49,7 +49,7 @@ filter_session_message (DBusConnection *connection,
return DBUS_HANDLER_RESULT_HANDLED;
}
else if (dbus_message_is_method_call (message,
"org.freedesktop.DBus.TestSuite.TestServer",
"org.freedesktop.DBus.TestSuite.PrivServer",
"Quit"))
{
fprintf (stderr, "server exiting loop\n");
@ -81,7 +81,7 @@ main (int argc, char *argv[])
test_connection_setup (loop, session);
dbus_bus_request_name (session, "org.freedesktop.DBus.TestSuite.TestServer", 0, &error);
dbus_bus_request_name (session, "org.freedesktop.DBus.TestSuite.PrivServer", 0, &error);
if (dbus_error_is_set (&error))
die ("couldn't request name: %s", error.message);