From 0a1022595e419c0dd06007329a6e95619d21f4fd Mon Sep 17 00:00:00 2001 From: CI Train Bot Date: Thu, 7 May 2015 15:27:00 +0000 Subject: Releasing 12.10.2+15.10.20150507-0ubuntu1 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dff996c..4d0314b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-sound (12.10.2+15.10.20150507-0ubuntu1) wily; urgency=medium + + [ Charles Kerr ] + * Use the BusWatcher to look for org.freedesktop.Notifications + ownership changes on the bus. (LP: #1432446) + + -- CI Train Bot Thu, 07 May 2015 15:27:00 +0000 + indicator-sound (12.10.2+15.04.20150421-0ubuntu1) vivid; urgency=medium [ Ted Gould ] -- cgit v1.2.3 From ce5f08b92eb0af68088cf2cc517c1035419bf38c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 27 May 2015 11:11:52 -0500 Subject: Using eventually to avoid arbitrary timeouts in tests --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4d0314b..827f5f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-sound (12.10.2+15.10.20150507-0ubuntu2) wily; urgency=medium + + * Using eventually to avoid arbitrary timeouts in tests + + -- Ted Gould Wed, 27 May 2015 11:11:19 -0500 + indicator-sound (12.10.2+15.10.20150507-0ubuntu1) wily; urgency=medium [ Charles Kerr ] -- cgit v1.2.3 From 1f2effb760005ab21a7916708cfe2f52cacba6dc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 27 May 2015 11:19:00 -0500 Subject: Baking version number for PPA --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 827f5f5..f2f18e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (12.10.2+15.10.20150507-0ubuntu2) wily; urgency=medium +indicator-sound (12.10.2+15.10.20150507+eventually1-0ubuntu1) wily; urgency=medium * Using eventually to avoid arbitrary timeouts in tests -- cgit v1.2.3 From 83e25c49ed45d5e16667fe89eb2338f4c3593b52 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 27 May 2015 11:45:11 -0500 Subject: Adding in a session bus --- debian/changelog | 2 +- tests/media-player-user.cc | 30 ++++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f2f18e9..ddae1f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (12.10.2+15.10.20150507+eventually1-0ubuntu1) wily; urgency=medium +indicator-sound (12.10.2+15.10.20150507+eventually2-0ubuntu1) wily; urgency=medium * Using eventually to avoid arbitrary timeouts in tests diff --git a/tests/media-player-user.cc b/tests/media-player-user.cc index 51e7a49..12e967e 100644 --- a/tests/media-player-user.cc +++ b/tests/media-player-user.cc @@ -34,26 +34,42 @@ class MediaPlayerUserTest : public ::testing::Test { protected: - DbusTestService * service = NULL; + DbusTestService * testsystem = NULL; AccountsServiceMock service_mock; + DbusTestService * testsession = NULL; + GDBusConnection * system = NULL; + GDBusConnection * session = NULL; GDBusProxy * proxy = NULL; std::chrono::milliseconds _eventuallyTime = std::chrono::seconds{5}; virtual void SetUp() { - service = dbus_test_service_new(NULL); - dbus_test_service_set_bus(service, DBUS_TEST_SERVICE_BUS_SYSTEM); + /* System Bus */ + testsystem = dbus_test_service_new(NULL); + dbus_test_service_set_bus(testsystem, DBUS_TEST_SERVICE_BUS_SYSTEM); - dbus_test_service_add_task(service, (DbusTestTask*)service_mock); - dbus_test_service_start_tasks(service); + dbus_test_service_add_task(testsystem, (DbusTestTask*)service_mock); + dbus_test_service_start_tasks(testsystem); system = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL); ASSERT_NE(nullptr, system); g_dbus_connection_set_exit_on_close(system, FALSE); g_object_add_weak_pointer(G_OBJECT(system), (gpointer *)&system); + /* Session Bus */ + testsession = dbus_test_service_new(NULL); + dbus_test_service_set_bus(testsession, DBUS_TEST_SERVICE_BUS_SESSION); + + dbus_test_service_start_tasks(testsession); + + session = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL); + ASSERT_NE(nullptr, session); + g_dbus_connection_set_exit_on_close(session, FALSE); + g_object_add_weak_pointer(G_OBJECT(session), (gpointer *)&session); + + /* Setup proxy */ proxy = g_dbus_proxy_new_sync(system, G_DBUS_PROXY_FLAGS_NONE, NULL, @@ -66,9 +82,11 @@ class MediaPlayerUserTest : public ::testing::Test virtual void TearDown() { g_clear_object(&proxy); - g_clear_object(&service); + g_clear_object(&testsystem); + g_clear_object(&testsession); g_object_unref(system); + g_object_unref(session); #if 0 /* Accounts Service keeps a bunch of references around so we -- cgit v1.2.3 From b830d51de707f2b3ce4722fe6a01bf8149b26e27 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 27 May 2015 13:59:59 -0500 Subject: Erg, PPAs --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ddae1f3..e910f16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (12.10.2+15.10.20150507+eventually2-0ubuntu1) wily; urgency=medium +indicator-sound (12.10.2+15.10.20150507+eventually3-0ubuntu1) wily; urgency=medium * Using eventually to avoid arbitrary timeouts in tests -- cgit v1.2.3 From 52b6aaeede8ec6192844a5b9813f7509bd313b60 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 28 May 2015 08:47:33 -0500 Subject: For Launchpad --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e910f16..c360efd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 -- cgit v1.2.3