From a62a84b5db8f2b9a79a79f8102a2b3ead6eddb7f Mon Sep 17 00:00:00 2001 From: Juergen Gehring Date: Thu, 8 May 2014 16:11:41 +0200 Subject: Commented out disabled connection test. --- src/test/DBusConnectionTest.cpp | 104 ++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/src/test/DBusConnectionTest.cpp b/src/test/DBusConnectionTest.cpp index 8477e38..00d41fa 100644 --- a/src/test/DBusConnectionTest.cpp +++ b/src/test/DBusConnectionTest.cpp @@ -304,60 +304,60 @@ TEST_F(DBusConnectionTest, LibdbusConnectionsMayCommitSuicide) { dispatchThread.join(); } -std::promise promise2; -std::future future2 = promise2.get_future(); -std::promise promise3; -std::future future3 = promise3.get_future(); - -void noPartnerCallback(DBusPendingCall*, void* data) { - ::DBusConnection* libdbusConnection = reinterpret_cast(data); - dbus_connection_close(libdbusConnection); - dbus_connection_unref(libdbusConnection); - promise2.set_value(true); -} - -void noPartnerCleanup(void* data) { - promise3.set_value(true); -} +//std::promise promise2; +//std::future future2 = promise2.get_future(); +//std::promise promise3; +//std::future future3 = promise3.get_future(); +// +//void noPartnerCallback(DBusPendingCall*, void* data) { +// ::DBusConnection* libdbusConnection = reinterpret_cast(data); +// dbus_connection_close(libdbusConnection); +// dbus_connection_unref(libdbusConnection); +// promise2.set_value(true); +//} +// +//void noPartnerCleanup(void* data) { +// promise3.set_value(true); +//} // libdbus bug -TEST_F(DBusConnectionTest, DISABLED_TimeoutForNonexistingServices) { - const ::DBusBusType libdbusType = ::DBusBusType::DBUS_BUS_SESSION; - ::DBusError libdbusError; - dbus_error_init(&libdbusError); - ::DBusConnection* libdbusConnection = dbus_bus_get_private(libdbusType, &libdbusError); - - assert(libdbusConnection); - dbus_connection_set_exit_on_disconnect(libdbusConnection, false); - - auto dispatchThread = std::thread(&dispatch, libdbusConnection); - - ::DBusMessage* libdbusMessageCall = dbus_message_new_method_call( - "some.connection.somewhere", - "/some/non/existing/object", - "some.interface.somewhere.but.same.place", - "NoReasonableMethod"); - - dbus_message_set_signature(libdbusMessageCall, ""); - - - DBusPendingCall* libdbusPendingCall; - - dbus_connection_send_with_reply( - libdbusConnection, - libdbusMessageCall, - &libdbusPendingCall, - 5000); - - dbus_pending_call_set_notify( - libdbusPendingCall, - noPartnerCallback, - libdbusConnection, - noPartnerCleanup); - - ASSERT_EQ(true, future2.get()); - dispatchThread.join(); -} +//TEST_F(DBusConnectionTest, DISABLED_TimeoutForNonexistingServices) { +// const ::DBusBusType libdbusType = ::DBusBusType::DBUS_BUS_SESSION; +// ::DBusError libdbusError; +// dbus_error_init(&libdbusError); +// ::DBusConnection* libdbusConnection = dbus_bus_get_private(libdbusType, &libdbusError); +// +// assert(libdbusConnection); +// dbus_connection_set_exit_on_disconnect(libdbusConnection, false); +// +// auto dispatchThread = std::thread(&dispatch, libdbusConnection); +// +// ::DBusMessage* libdbusMessageCall = dbus_message_new_method_call( +// "some.connection.somewhere", +// "/some/non/existing/object", +// "some.interface.somewhere.but.same.place", +// "NoReasonableMethod"); +// +// dbus_message_set_signature(libdbusMessageCall, ""); +// +// +// DBusPendingCall* libdbusPendingCall; +// +// dbus_connection_send_with_reply( +// libdbusConnection, +// libdbusMessageCall, +// &libdbusPendingCall, +// 5000); +// +// dbus_pending_call_set_notify( +// libdbusPendingCall, +// noPartnerCallback, +// libdbusConnection, +// noPartnerCleanup); +// +// ASSERT_EQ(true, future2.get()); +// dispatchThread.join(); +//} #ifndef WIN32 int main(int argc, char** argv) { -- cgit v1.2.1