diff -Nru indicator-sound-12.10.2+15.10.20150507+eventually3/debian/changelog indicator-sound-12.10.2+15.10.20150507+eventually4/debian/changelog --- indicator-sound-12.10.2+15.10.20150507+eventually3/debian/changelog 2015-05-28 13:50:20.000000000 +0000 +++ indicator-sound-12.10.2+15.10.20150507+eventually4/debian/changelog 2015-05-28 13:50:20.000000000 +0000 @@ -1,4 +1,4 @@ -indicator-sound (12.10.2+15.10.20150507+eventually3-0ubuntu1) wily; urgency=medium +indicator-sound (12.10.2+15.10.20150507+eventually4-0ubuntu1) wily; urgency=medium * Using eventually to avoid arbitrary timeouts in tests diff -Nru indicator-sound-12.10.2+15.10.20150507+eventually3/tests/media-player-user.cc indicator-sound-12.10.2+15.10.20150507+eventually4/tests/media-player-user.cc --- indicator-sound-12.10.2+15.10.20150507+eventually3/tests/media-player-user.cc 2015-05-27 18:46:45.000000000 +0000 +++ indicator-sound-12.10.2+15.10.20150507+eventually4/tests/media-player-user.cc 2015-05-28 13:46:18.000000000 +0000 @@ -39,6 +39,9 @@ DbusTestService * testsession = NULL; + DbusTestProcess * systemmonitor = nullptr; + DbusTestProcess * sessionmonitor = nullptr; + GDBusConnection * system = NULL; GDBusConnection * session = NULL; GDBusProxy * proxy = NULL; @@ -50,6 +53,11 @@ testsystem = dbus_test_service_new(NULL); dbus_test_service_set_bus(testsystem, DBUS_TEST_SERVICE_BUS_SYSTEM); + systemmonitor = dbus_test_process_new("dbus-monitor"); + dbus_test_process_append_param(systemmonitor, "--system"); + dbus_test_task_set_name(DBUS_TEST_TASK(systemmonitor), "System"); + dbus_test_service_add_task(testsystem, DBUS_TEST_TASK(systemmonitor)); + dbus_test_service_add_task(testsystem, (DbusTestTask*)service_mock); dbus_test_service_start_tasks(testsystem); @@ -62,6 +70,11 @@ testsession = dbus_test_service_new(NULL); dbus_test_service_set_bus(testsession, DBUS_TEST_SERVICE_BUS_SESSION); + sessionmonitor = dbus_test_process_new("dbus-monitor"); + dbus_test_process_append_param(sessionmonitor, "--session"); + dbus_test_task_set_name(DBUS_TEST_TASK(sessionmonitor), "Session"); + dbus_test_service_add_task(testsession, DBUS_TEST_TASK(sessionmonitor)); + dbus_test_service_start_tasks(testsession); session = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL); @@ -81,6 +94,9 @@ } virtual void TearDown() { + g_clear_object(&sessionmonitor); + g_clear_object(&systemmonitor); + g_clear_object(&proxy); g_clear_object(&testsystem); g_clear_object(&testsession);