Merge lp:~dobey/indicator-sound/drop-greeeter into lp:indicator-sound

[dobey]

Strip out the complicated non-working greeter support.

This removes the code which theoretically proxies the player controls out to the greeter screen, that doesn't work.

The Sound menu spec states that the player controls should NOT appear on the greeter screen:

https://wiki.ubuntu.com/Sound#Music_player_sections
"Whenever you are logged in (that is, not in the standalone installer session or at the login screen), any music player that advertises itself over http://mpris.org/ Mpris should have its own section in the sound menu."

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:552
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/14/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1858/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1865
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1641/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1641/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1641/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1641/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1641/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1641/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/14/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

So, first off, I'm not super happy with the tone of the MR, e.g. "theoretically". If the code needs fixing then that's something that should be addressed, but bugs happen and there's no need to be snide about it.

Secondly, I still disagree with the removal of this feature. Controlling play from the greeter is a worthwhile feature IMO.

But as per the discussion in the Indicator meeting today, I'm in the minority on this. If neither the coder doing the work, NOR the designer, want this feature, I'm not going to block the change. :P

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:552
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/24/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1892
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1899
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1681
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1681/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1681
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1681/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1681
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1681/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1681
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1681/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1681
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1681/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1681
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1681/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/24/rebuild

review: Approve (continuous-integration)

Unmerged revisions

552. By dobey on 2017-03-23

Strip out the complicated non-working greeter support.

=== modified file 'debian/control'
--- debian/control	2017-02-07 22:04:35 +0000
+++ debian/control	2017-03-23 19:32:45 +0000
@@ -56,7 +56,6 @@
          indicator-common,
 Recommends: unity-control-center | gnome-control-center | ubuntu-system-settings | pavucontrol | mate-media,
             accountsservice,
-Suggests: unity-greeter-session-broadcast,
 Description: System sound indicator.
  System sound indicator which provides easy control of the PulseAudio sound 
  daemon.

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-02-07 21:50:25 +0000
+++ src/CMakeLists.txt	2017-03-23 19:32:45 +0000
@@ -134,13 +134,6 @@
     mpris2-interfaces
 )
 vala_add(indicator-sound-service
-  media-player-user.vala
-  DEPENDS
-    media-player
-    accounts-service-sound-settings
-    greeter-broadcast
-)
-vala_add(indicator-sound-service
   media-player-list.vala
   DEPENDS
     media-player
@@ -154,13 +147,6 @@
     mpris2-interfaces
 )
 vala_add(indicator-sound-service
-  media-player-list-greeter.vala
-  DEPENDS
-    media-player-list
-    media-player-user
-    media-player
-)
-vala_add(indicator-sound-service
   mpris2-interfaces.vala
 )
 vala_add(indicator-sound-service
@@ -183,7 +169,6 @@
     accounts-service-sound-settings
     accounts-service-privacy-settings
     accounts-service-system-sound-settings
-    greeter-broadcast
 )
 vala_add(indicator-sound-service
   accounts-service-sound-settings.vala
@@ -194,9 +179,6 @@
 vala_add(indicator-sound-service
   accounts-service-system-sound-settings.vala
 )
-vala_add(indicator-sound-service
-  greeter-broadcast.vala
-)
 
 vala_finish(indicator-sound-service
   SOURCES
@@ -235,8 +217,8 @@
 )
 
 add_library(
-    indicator-sound-service-lib STATIC
-    ${INDICATOR_SOUND_SOURCES}
+  indicator-sound-service-lib STATIC
+  ${INDICATOR_SOUND_SOURCES}
 )
 
 target_link_libraries(

=== modified file 'src/accounts-service-user.vala'
--- src/accounts-service-user.vala	2015-12-31 20:49:42 +0000
+++ src/accounts-service-user.vala	2017-03-23 19:32:45 +0000
@@ -25,9 +25,6 @@
 	AccountsServiceSystemSoundSettings? syssoundproxy = null;
 	uint timer = 0;
 	MediaPlayer? _player = null;
-	GreeterBroadcast? greeter = null;
-
-	public bool showDataOnGreeter { get; set; }
 
 	bool _silentMode = false;
 	public bool silentMode {
@@ -118,14 +115,6 @@
 		user = accounts_manager.get_user(GLib.Environment.get_user_name());
 		user.notify["is-loaded"].connect(() => user_loaded_changed());
 		user_loaded_changed();
-
-		Bus.get_proxy.begin<GreeterBroadcast> (
-			BusType.SYSTEM,
-			"com.canonical.Unity.Greeter.Broadcast",
-			"/com/canonical/Unity/Greeter/Broadcast",
-			DBusProxyFlags.NONE,
-			null,
-			greeter_proxy_new);
 	}
 
 	void user_loaded_changed () {
@@ -188,11 +177,8 @@
 				var welcomeval = changed.lookup_value("MessagesWelcomeScreen", VariantType.BOOLEAN);
 				if (welcomeval != null) {
 					debug("Messages on welcome screen changed");
-					this.showDataOnGreeter = welcomeval.get_boolean();
 				}
 			});
-
-			this.showDataOnGreeter = this.privacyproxy.messages_welcome_screen;
 		} catch (Error e) {
 			this.privacyproxy = null;
 			warning("Unable to get proxy to user privacy settings: %s", e.message);
@@ -219,37 +205,4 @@
 			warning("Unable to get proxy to system sound settings: %s", e.message);
 		}
 	}
-
-	void greeter_proxy_new (GLib.Object? obj, AsyncResult res) {
-		try {
-			this.greeter = Bus.get_proxy.end (res);
-
-			this.greeter.SoundPlayPause.connect((username) => {
-				if (username != GLib.Environment.get_user_name())
-					return;
-				if (this._player == null)
-					return;
-				this._player.play_pause();
-			});
-
-			this.greeter.SoundNext.connect((username) => {
-				if (username != GLib.Environment.get_user_name())
-					return;
-				if (this._player == null)
-					return;
-				this._player.next();
-			});
-
-			this.greeter.SoundPrev.connect((username) => {
-				if (username != GLib.Environment.get_user_name())
-					return;
-				if (this._player == null)
-					return;
-				this._player.previous();
-			});
-		} catch (Error e) {
-			this.greeter = null;
-			warning("Unable to get greeter proxy: %s", e.message);
-		}
-	}
 }

=== removed file 'src/greeter-broadcast.vala'
--- src/greeter-broadcast.vala	2014-03-13 18:38:55 +0000
+++ src/greeter-broadcast.vala	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright 2014 © Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Ted Gould <[e-mail]>
- */
-
-[DBus (name = "com.canonical.Unity.Greeter.Broadcast")]
-public interface GreeterBroadcast : Object {
-  // methods
-  // unused public abstract async void RequestApplicationStart(string name, string appid) throws IOError;
-  // unused public abstract async void RequestHomeShown(string name) throws IOError;
-  public abstract async void RequestSoundPlayPause(string name) throws IOError;
-  public abstract async void RequestSoundNext(string name) throws IOError;
-  public abstract async void RequestSoundPrev(string name) throws IOError;
-  // signals
-  // unused public signal void StartApplication(string username, string appid);
-  // unused public signal void ShowHome(string username);
-  public signal void SoundPlayPause(string username);
-  public signal void SoundNext(string username);
-  public signal void SoundPrev(string username);
-}

=== modified file 'src/main.c'
--- src/main.c	2016-02-23 12:48:46 +0000
+++ src/main.c	2017-03-23 19:32:45 +0000
@@ -54,12 +54,8 @@
     AccountsServiceAccess * accounts_service_access = NULL;
 
 
-    if (g_strcmp0("lightdm", g_get_user_name()) == 0) {
-        playerlist = MEDIA_PLAYER_LIST(media_player_list_greeter_new());
-    } else {
-        playerlist = MEDIA_PLAYER_LIST(media_player_list_mpris_new());
-        accounts = accounts_service_user_new();
-    }
+    playerlist = MEDIA_PLAYER_LIST(media_player_list_mpris_new());
+    accounts = accounts_service_user_new();
 
     pgloop = pa_glib_mainloop_new(NULL);
     options = indicator_sound_options_gsettings_new();

=== removed file 'src/media-player-list-greeter.vala'
--- src/media-player-list-greeter.vala	2014-04-01 23:20:56 +0000
+++ src/media-player-list-greeter.vala	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Ted Gould <[e-mail]>
- */
-
-[DBus (name="com.canonical.UnityGreeter.List")]
-public interface UnityGreeterList : Object {
-	public abstract async string get_active_entry () throws IOError;
-	public signal void entry_selected (string entry_name);
-}
-
-public class MediaPlayerListGreeter : MediaPlayerList {
-	string? selected_user = null;
-	UnityGreeterList? proxy = null;
-	HashTable<string, MediaPlayerUser> players = new HashTable<string, MediaPlayerUser>(str_hash, str_equal);
-
-	public MediaPlayerListGreeter () {
-		Bus.get_proxy.begin<UnityGreeterList> (
-			BusType.SESSION,
-			"com.canonical.UnityGreeter",
-			"/list",
-			DBusProxyFlags.NONE,
-			null,
-			new_proxy);
-	}
-
-	void new_proxy (GLib.Object? obj, AsyncResult res) {
-		try {
-			this.proxy = Bus.get_proxy.end(res);
-
-			this.proxy.entry_selected.connect(active_user_changed);
-			this.proxy.get_active_entry.begin ((obj, res) => {
-				try {
-					var value = (obj as UnityGreeterList).get_active_entry.end(res);
-					active_user_changed(value);
-				} catch (Error e) {
-					warning("Unable to get active entry: %s", e.message);
-				}
-			});
-		} catch (Error e) {
-			this.proxy = null;
-			warning("Unable to create proxy to the greeter: %s", e.message);
-		}
-	}
-
-	void active_user_changed (string active_user) {
-		/* No change, move along */
-		if (selected_user == active_user) {
-			return;
-		}
-
-		debug(@"Active user changed to: $active_user");
-
-		var old_user = selected_user;
-
-		/* Protect against a null user */
-		if (active_user != "" && active_user[0] != '*') {
-			selected_user = active_user;
-		} else {
-			debug(@"Blocking active user change for '$active_user'");
-			selected_user = null;
-		}
-
-		if (selected_user != null && !players.contains(selected_user)) {
-			players.insert(selected_user, new MediaPlayerUser(selected_user));
-		}
-
-		if (old_user != null) {
-			var old_player = players.lookup(old_user);
-			debug("Removing player for user: %s", old_user);
-			player_removed(old_player);
-		}
-
-		if (selected_user != null) {
-			var new_player = players.lookup(selected_user);
-
-			if (new_player != null) {
-				debug("Adding player for user: %s", selected_user);
-				player_added(new_player);
-			}
-		}
-	}
-
-	/* We need to have an iterator for the interface, but eh, we can
-	   only ever have one player for the current user */
-	public class Iterator : MediaPlayerList.Iterator {
-		int i = 0;
-		MediaPlayerListGreeter list;
-
-		public Iterator (MediaPlayerListGreeter in_list) {
-			list = in_list;
-		}
-
-		public override MediaPlayer? next_value () {
-			MediaPlayer? retval = null;
-
-			if (i == 0 && list.selected_user != null) {
-				retval = list.players.lookup(list.selected_user);
-			}
-			i++;
-
-			return retval;
-		}
-	}
-
-	public override MediaPlayerList.Iterator iterator() {
-		return new Iterator(this) as MediaPlayerList.Iterator;
-	}
-}

=== modified file 'src/media-player-user.vala'
--- src/media-player-user.vala	2015-12-29 17:05:16 +0000
+++ src/media-player-user.vala	2017-03-23 19:32:45 +0000
@@ -22,7 +22,6 @@
 	string username;
 	Act.User? actuser = null;
 	AccountsServiceSoundSettings? proxy = null;
-	GreeterBroadcast? greeter = null;
 
 	HashTable<string, bool> properties_queued = new HashTable<string, bool>(str_hash, str_equal);
 	uint properties_timeout = 0;
@@ -46,14 +45,6 @@
 				null,
 				new_proxy);
 		});
-
-		Bus.get_proxy.begin<GreeterBroadcast> (
-			BusType.SYSTEM,
-			"com.canonical.Unity.Greeter.Broadcast",
-			"/com/canonical/Unity/Greeter/Broadcast",
-			DBusProxyFlags.NONE,
-			null,
-			greeter_proxy_new);
 	}
 
 	~MediaPlayerUser () {
@@ -219,15 +210,6 @@
 		set { }
 	}
 
-	void greeter_proxy_new (GLib.Object? obj, AsyncResult res) {
-		try {
-			this.greeter = Bus.get_proxy.end (res);
-		} catch (Error e) {
-			this.greeter = null;
-			warning("Unable to get greeter proxy: %s", e.message);
-		}
-	}
-
 	/* Control functions through unity-greeter-session-broadcast */
 	public override void activate () {
 		/* TODO: */

=== modified file 'src/service.vala'
--- src/service.vala	2016-04-15 09:55:49 +0000
+++ src/service.vala	2017-03-23 19:32:45 +0000
@@ -73,15 +73,6 @@
 		});
 
 		this.accounts_service = accounts;
-		/* If we're on the greeter, don't export */
-		if (this.accounts_service != null) {
-			this.accounts_service.notify["showDataOnGreeter"].connect(() => {
-				this.export_to_accounts_service = this.accounts_service.showDataOnGreeter;
-				eventually_update_player_actions();
-			});
-
-			this.export_to_accounts_service = this.accounts_service.showDataOnGreeter;
-		}
 
 		this.players = playerlist;
 		this.players.player_added.connect (this.player_added);

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-02-07 21:50:25 +0000
+++ tests/CMakeLists.txt	2017-03-23 19:32:45 +0000
@@ -212,55 +212,6 @@
 add_test(notifications-test notifications-test)
 
 ###########################
-# Accounts Service User
-###########################
-
-include_directories(${CMAKE_SOURCE_DIR}/src)
-add_executable (media-player-user-test media-player-user.cc)
-target_link_libraries (
-    media-player-user-test
-    indicator-sound-service-lib
-    vala-mocks-lib
-    ${SOUNDSERVICE_LIBRARIES}
-    ${TEST_LIBRARIES}
-    ${GMOCK_LIBRARIES}
-)
-
-# Split tests to work around libaccountservice sucking
-add_test(media-player-user-test-basic
-    media-player-user-test  --gtest_filter=MediaPlayerUserTest.BasicObject
-)
-add_test(media-player-user-test-dataset
-    media-player-user-test  --gtest_filter=MediaPlayerUserTest.DataSet
-)
-add_test(media-player-user-test-timeout
-    media-player-user-test  --gtest_filter=MediaPlayerUserTest.TimeoutTest
-)
-
-###########################
-# Greeter List
-###########################
-
-include_directories(${CMAKE_SOURCE_DIR}/src)
-add_executable (greeter-list-test greeter-list.cc)
-target_link_libraries (
-    greeter-list-test
-    indicator-sound-service-lib
-    vala-mocks-lib
-    ${SOUNDSERVICE_LIBRARIES}
-    ${TEST_LIBRARIES}
-    ${GMOCK_LIBRARIES}
-)
-
-# Split tests to work around libaccountservice sucking
-add_test(greeter-list-test-basic
-    greeter-list-test  --gtest_filter=GreeterListTest.BasicObject
-)
-add_test(greeter-list-test-iterator
-    greeter-list-test  --gtest_filter=GreeterListTest.BasicIterator
-)
-
-###########################
 # Indicator Test
 ###########################
 
@@ -293,8 +244,6 @@
   volume-control-test
   sound-menu-test
   notifications-test
-  media-player-user-test
-  greeter-list-test
   indicator-test
   PARENT_SCOPE
 )

=== removed file 'tests/greeter-list.cc'
--- tests/greeter-list.cc	2014-03-25 13:52:31 +0000
+++ tests/greeter-list.cc	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Ted Gould <[e-mail]>
- */
-
-#include <gtest/gtest.h>
-#include <gio/gio.h>
-
-extern "C" {
-#include "indicator-sound-service.h"
-#include "vala-mocks.h"
-}
-
-class GreeterListTest : public ::testing::Test
-{
-	protected:
-		GTestDBus * bus = nullptr;
-
-		virtual void SetUp() {
-			bus = g_test_dbus_new(G_TEST_DBUS_NONE);
-			g_test_dbus_up(bus);
-		}
-
-		virtual void TearDown() {
-			g_test_dbus_down(bus);
-			g_clear_object(&bus);
-		}
-
-};
-
-TEST_F(GreeterListTest, BasicObject) {
-	MediaPlayerListGreeter * list = media_player_list_greeter_new();
-
-	ASSERT_NE(nullptr, list);
-
-	g_clear_object(&list);
-	return;
-}
-
-TEST_F(GreeterListTest, BasicIterator) {
-	MediaPlayerListGreeter * list = media_player_list_greeter_new();
-	ASSERT_NE(nullptr, list);
-
-	MediaPlayerListGreeterIterator * iter = media_player_list_greeter_iterator_new(list);
-	ASSERT_NE(nullptr, iter);
-
-	MediaPlayer * player = media_player_list_iterator_next_value (MEDIA_PLAYER_LIST_ITERATOR(iter));
-	ASSERT_EQ(nullptr, player);
-
-	g_clear_object(&iter);
-	g_clear_object(&list);
-	return;
-}
-

=== removed file 'tests/media-player-user.cc'
--- tests/media-player-user.cc	2015-08-12 00:13:59 +0000
+++ tests/media-player-user.cc	1970-01-01 00:00:00 +0000
@@ -1,320 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Ted Gould <[e-mail]>
- */
-
-#include <chrono>
-#include <future>
-
-#include <gtest/gtest.h>
-#include <gio/gio.h>
-#include <libdbustest/dbus-test.h>
-
-#include "accounts-service-mock.h"
-
-extern "C" {
-#include "indicator-sound-service.h"
-}
-
-class MediaPlayerUserTest : public ::testing::Test
-{
-
-	protected:
-		DbusTestService * testsystem = NULL;
-		AccountsServiceMock service_mock;
-
-		DbusTestService * testsession = NULL;
-
-		DbusTestProcess * systemmonitor = nullptr;
-		DbusTestProcess * sessionmonitor = nullptr;
-
-		GDBusConnection * system = NULL;
-		GDBusConnection * session = NULL;
-		GDBusProxy * proxy = NULL;
-
-		std::chrono::milliseconds _eventuallyTime = std::chrono::seconds{5};
-
-		virtual void SetUp() {
-			/* System Bus */
-			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);
-
-			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);
-
-			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);
-			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,
-				"org.freedesktop.Accounts",
-				"/user",
-				"org.freedesktop.DBus.Properties",
-				NULL, NULL);
-			ASSERT_NE(nullptr, proxy);
-		}
-
-		virtual void TearDown() {
-			g_clear_object(&sessionmonitor);
-			g_clear_object(&systemmonitor);
-
-			g_clear_object(&proxy);
-			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
-			   have to split the tests and can't check this :-( */
-			unsigned int cleartry = 0;
-			while ((session != NULL || system != NULL) && cleartry < 100) {
-				loop(100);
-				cleartry++;
-			}
-
-			ASSERT_EQ(nullptr, session);
-			ASSERT_EQ(nullptr, system);
-			#endif
-		}
-
-		static gboolean timeout_cb (gpointer user_data) {
-			GMainLoop * loop = static_cast<GMainLoop *>(user_data);
-			g_main_loop_quit(loop);
-			return G_SOURCE_REMOVE;
-		}
-
-		void loop (unsigned int ms) {
-			GMainLoop * loop = g_main_loop_new(NULL, FALSE);
-			g_timeout_add(ms, timeout_cb, loop);
-			g_main_loop_run(loop);
-			g_main_loop_unref(loop);
-		}
-
-		void set_property (const gchar * name, GVariant * value) {
-			dbus_test_dbus_mock_object_update_property((DbusTestDbusMock *)service_mock, service_mock.get_sound(), name, value, NULL);
-		}
-
-		testing::AssertionResult expectEventually (std::function<testing::AssertionResult(void)> &testfunc) {
-			auto loop = std::shared_ptr<GMainLoop>(g_main_loop_new(nullptr, FALSE), [](GMainLoop * loop) { if (loop != nullptr) g_main_loop_unref(loop); });
-
-			std::promise<testing::AssertionResult> retpromise;
-			auto retfuture = retpromise.get_future();
-			auto start = std::chrono::steady_clock::now();
-
-			/* The core of the idle function as an object so we can use the C++-isms
-			   of attaching the variables and make this code reasonably readable */
-			std::function<void(void)> idlefunc = [&loop, &retpromise, &testfunc, &start, this]() -> void {
-				auto result = testfunc();
-
-				if (result == false && _eventuallyTime > (std::chrono::steady_clock::now() - start)) {
-					return;
-				}
-
-				retpromise.set_value(result);
-				g_main_loop_quit(loop.get());
-			};
-
-			auto idlesrc = g_idle_add([](gpointer data) -> gboolean {
-				auto func = reinterpret_cast<std::function<void(void)> *>(data);
-				(*func)();
-				return G_SOURCE_CONTINUE;
-			}, &idlefunc);
-
-			g_main_loop_run(loop.get());
-			g_source_remove(idlesrc);
-
-			return retfuture.get();
-		}
-
-		/* Eventually Helpers */
-		#define _EVENTUALLY_HELPER(oper) \
-		template <typename... Args> testing::AssertionResult expectEventually##oper (Args&& ... args) { \
-			std::function<testing::AssertionResult(void)> func = [&]() { \
-				return testing::internal::CmpHelper##oper(std::forward<Args>(args)...); \
-			}; \
-			return expectEventually(func); \
-		}
-
-		_EVENTUALLY_HELPER(EQ);
-		_EVENTUALLY_HELPER(NE);
-		_EVENTUALLY_HELPER(LT);
-		_EVENTUALLY_HELPER(GT);
-		_EVENTUALLY_HELPER(STREQ);
-		_EVENTUALLY_HELPER(STRNE);
-
-		#undef _EVENTUALLY_HELPER
-};
-
-/* Helpers */
-#define EXPECT_EVENTUALLY_EQ(expected, actual) \
-	EXPECT_PRED_FORMAT2(MediaPlayerUserTest::expectEventuallyEQ, expected, actual)
-
-#define EXPECT_EVENTUALLY_NE(expected, actual) \
-	EXPECT_PRED_FORMAT2(MediaPlayerUserTest::expectEventuallyNE, expected, actual)
-
-#define EXPECT_EVENTUALLY_LT(expected, actual) \
-	EXPECT_PRED_FORMAT2(MediaPlayerUserTest::expectEventuallyLT, expected, actual)
-
-#define EXPECT_EVENTUALLY_GT(expected, actual) \
-	EXPECT_PRED_FORMAT2(MediaPlayerUserTest::expectEventuallyGT, expected, actual)
-
-#define EXPECT_EVENTUALLY_STREQ(expected, actual) \
-	EXPECT_PRED_FORMAT2(MediaPlayerUserTest::expectEventuallySTREQ, expected, actual)
-
-#define EXPECT_EVENTUALLY_STRNE(expected, actual) \
-	EXPECT_PRED_FORMAT2(MediaPlayerUserTest::expectEventuallySTRNE, expected, actual)
-
-
-TEST_F(MediaPlayerUserTest, BasicObject) {
-	MediaPlayerUser * player = media_player_user_new("user");
-	ASSERT_NE(nullptr, player);
-
-	/* Protected, but no useful data */
-	EXPECT_FALSE(media_player_get_is_running(MEDIA_PLAYER(player)));
-	EXPECT_TRUE(media_player_get_can_raise(MEDIA_PLAYER(player)));
-	EXPECT_STREQ("user", media_player_get_id(MEDIA_PLAYER(player)));
-	EXPECT_STREQ("", media_player_get_name(MEDIA_PLAYER(player)));
-	EXPECT_STREQ("", media_player_get_state(MEDIA_PLAYER(player)));
-	EXPECT_EQ(nullptr, media_player_get_icon(MEDIA_PLAYER(player)));
-	EXPECT_EQ(nullptr, media_player_get_current_track(MEDIA_PLAYER(player)));
-
-	/* Get the proxy -- but no good data */
-	loop(100);
-
-	/* Ensure even with the proxy we don't have anything */
-	EXPECT_FALSE(media_player_get_is_running(MEDIA_PLAYER(player)));
-	EXPECT_TRUE(media_player_get_can_raise(MEDIA_PLAYER(player)));
-	EXPECT_STREQ("user", media_player_get_id(MEDIA_PLAYER(player)));
-	EXPECT_STREQ("", media_player_get_name(MEDIA_PLAYER(player)));
-	EXPECT_STREQ("", media_player_get_state(MEDIA_PLAYER(player)));
-	EXPECT_EQ(nullptr, media_player_get_icon(MEDIA_PLAYER(player)));
-	EXPECT_EQ(nullptr, media_player_get_current_track(MEDIA_PLAYER(player)));
-
-	g_clear_object(&player);
-}
-
-void
-running_update (GObject * obj, GParamSpec * pspec, bool * running) {
-	*running = media_player_get_is_running(MEDIA_PLAYER(obj)) == TRUE;
-};
-
-TEST_F(MediaPlayerUserTest, DISABLED_DataSet) {
-	/* Put data into Acts */
-	set_property("Timestamp", g_variant_new_uint64(g_get_monotonic_time()));
-	set_property("PlayerName", g_variant_new_string("The Player Formerly Known as Prince"));
-	GIcon * in_icon = g_themed_icon_new_with_default_fallbacks("foo-bar-fallback");
-	set_property("PlayerIcon", g_variant_new_variant(g_icon_serialize(in_icon)));
-	set_property("State", g_variant_new_string("Chillin'"));
-	set_property("Title", g_variant_new_string("Dictator"));
-	set_property("Artist", g_variant_new_string("Bansky"));
-	set_property("Album", g_variant_new_string("Vinyl is dead"));
-	set_property("ArtUrl", g_variant_new_string("http://art.url"));
-
-	/* Build our media player */
-	MediaPlayerUser * player = media_player_user_new("user");
-	ASSERT_NE(nullptr, player);
-
-	/* Ensure even with the proxy we don't have anything */
-	bool running = false;
-	g_signal_connect(G_OBJECT(player), "notify::is-running", G_CALLBACK(running_update), &running);
-	running_update(G_OBJECT(player), nullptr, &running);
-	EXPECT_EVENTUALLY_EQ(true, running);
-	EXPECT_TRUE(media_player_get_can_raise(MEDIA_PLAYER(player)));
-	EXPECT_STREQ("user", media_player_get_id(MEDIA_PLAYER(player)));
-	EXPECT_STREQ("The Player Formerly Known as Prince", media_player_get_name(MEDIA_PLAYER(player)));
-	EXPECT_STREQ("Chillin'", media_player_get_state(MEDIA_PLAYER(player)));
-
-	GIcon * out_icon = media_player_get_icon(MEDIA_PLAYER(player));
-	EXPECT_NE(nullptr, out_icon);
-	EXPECT_TRUE(g_icon_equal(in_icon, out_icon));
-	// NOTE: No reference in 'out_icon' returned
-
-	MediaPlayerTrack * track = media_player_get_current_track(MEDIA_PLAYER(player));
-	EXPECT_NE(nullptr, track);
-	EXPECT_STREQ("Dictator", media_player_track_get_title(track));
-	EXPECT_STREQ("Bansky", media_player_track_get_artist(track));
-	EXPECT_STREQ("Vinyl is dead", media_player_track_get_album(track));
-	EXPECT_STREQ("http://art.url", media_player_track_get_art_url(track));
-	// NOTE: No reference in 'track' returned
-
-	g_clear_object(&in_icon);
-	g_clear_object(&player);
-}
-
-TEST_F(MediaPlayerUserTest, DISABLED_TimeoutTest) {
-	/* Put data into Acts -- but 15 minutes ago */
-	set_property("Timestamp", g_variant_new_uint64(g_get_monotonic_time() - 15 * 60 * 1000 * 1000));
-	set_property("PlayerName", g_variant_new_string("The Player Formerly Known as Prince"));
-	GIcon * in_icon = g_themed_icon_new_with_default_fallbacks("foo-bar-fallback");
-	set_property("PlayerIcon", g_variant_new_variant(g_icon_serialize(in_icon)));
-	set_property("State", g_variant_new_string("Chillin'"));
-	set_property("Title", g_variant_new_string("Dictator"));
-	set_property("Artist", g_variant_new_string("Bansky"));
-	set_property("Album", g_variant_new_string("Vinyl is dead"));
-	set_property("ArtUrl", g_variant_new_string("http://art.url"));
-
-	/* Build our media player */
-	MediaPlayerUser * player = media_player_user_new("user");
-	ASSERT_NE(nullptr, player);
-
-	bool running = false;
-	g_signal_connect(G_OBJECT(player), "notify::is-running", G_CALLBACK(running_update), &running);
-	running_update(G_OBJECT(player), nullptr, &running);
-
-	/* Ensure that we show up as not running */
-	EXPECT_EVENTUALLY_EQ(false, running);
-
-	/* Update to make running */
-	set_property("Timestamp", g_variant_new_uint64(g_get_monotonic_time()));
-
-	EXPECT_EVENTUALLY_EQ(true, running);
-
-	/* Clear to not run */
-	set_property("Timestamp", g_variant_new_uint64(1));
-
-	EXPECT_EVENTUALLY_EQ(false, running);
-
-	g_clear_object(&in_icon);
-	g_clear_object(&player);
-}