Merge lp:~khurshid-alam/indicator-sound/fix-build-impish into lp:indicator-sound

[Khurshid Alam]

* Fix build against vala > 48 & vala >= 50

* Add symbolic icons to the tests

* Avoid possible null value in Greeterlist and GreeterBroadcast object.

  See https://github.com/AyatanaIndicators/ayatana-indicator-sound/commit/8df9168f5587cfd31e0bf6a4170a4c4f9784dbb7

* Fix build against GLib > 2.64: Replace HashTable with GenericSet

* Fix static member access

* Drop deprecated DBusProxy.create_for_bus

* Add libdbustest-1 include path

* Unit Tests: Unset environment variable and session bus in teardown

* debian/control: Remove qt5-default & add libgmock-dev in build depends. See https://bugs.launchpad.net/bugs/1921781

* Unit Tests: The desktop pulseaudio daemon also needs the stream-restore module these days

* Unit Tests: Disable notification tests that can not be fixed now. Most of them are phone related and depends on liburl-dispatcher library which was dropped from code since it is no longer in the universe repository. See https://bazaar.launchpad.net/~indicator-applet-developers/indicator-sound/trunk.16.10/revision/564

* Unit Tests: Disable indicator tests that can not be fixed now. These tests needs to be re-enabled later
   - tests/indicator-test.cc:PhoneMenu
   - tests/indicator-test.cc:DesktopMenu
   - tests/indicator-test.cc:BaseActions
   - tests/integration/test-indicator.cpp:All tests
   - tests/volume-control-test.cc:BasicObject

* debian/rules: Re enable live tests logs

Regarding tests, most only works on unity-8/phone environment and some are failing due to bugs libdbustest and gmock. As per my testing this doesn't hamper functionality on desktop, indicator-sound works as expected. These tests can be enabled for desktop later if someone able to fix those.

[Dmitry Shachnev (mitya57)]

In general this looks good to me, thanks!

[Gunnar Hjalmarsson (gunnarhj)]

I built it successfully on multiple archs:

https://launchpad.net/~gunnarhj/+archive/ubuntu/indicator-sound/+packages

So I'm ready to sponsor provided that you

* address Dmitry's questions/suggestions, and

* summarize the changes in a proper d/changelog entry.

review: Needs Fixing

[lp:~khurshid-alam/indicator-sound/fix-build-impish]

584. By Khurshid Alam on 2021-09-29

Keep dependency order sorted. Remove empty lines

[Khurshid Alam (khurshid-alam)]

@Gunner

Hi,

1. I addressed Dimitry's suggestions.

2. For debian/changelog, the way it works for bzr launchpad, I think, I don't change it. You merged and then released with d/changelog modified.

But I can still change from my end if it is required. Pleae let me know in comments.

[Gunnar Hjalmarsson (gunnarhj)]

Since it's multiple changes, I'd prefer if you include the d/changelog change in your merge request. (I think the practice differs between different teams, but in this case, as a sponsor, I ask you to do it.)

[lp:~khurshid-alam/indicator-sound/fix-build-impish]

585. By Khurshid Alam on 2021-09-29

Update d/changelog

[Khurshid Alam (khurshid-alam)]

Alright. I have updated the changelog.

[Gunnar Hjalmarsson (gunnarhj)]

Thanks! Merged and uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2020-06-04 12:59:23 +0000
+++ debian/changelog	2021-09-29 20:46:45 +0000
@@ -1,3 +1,39 @@
+indicator-sound (12.10.2+18.10.20180612-0ubuntu4) impish; urgency=medium
+
+  *  Fix build against vala > 48 & vala >= 50
+
+  *  Add symbolic icons to the tests
+
+  * Avoid possible null value in Greeterlist and GreeterBroadcast object.
+    See https://github.com/AyatanaIndicators/ayatana-indicator-sound/commit/8df9168f5587cfd31e0bf6a4170a4c4f9784dbb7
+
+  * Fix build against GLib > 2.64: Replace HashTable with GenericSet
+
+  * Fix static member access
+
+  * Drop deprecated DBusProxy.create_for_bus
+
+  * Add libdbustest-1 include path
+
+  * Unit Tests: Unset environment variable and session bus in teardown
+
+  * debian/control: Remove qt5-default & add libgmock-dev in build depends. See https://bugs.launchpad.net/bugs/1921781
+
+  * Unit Tests: The desktop pulseaudio daemon also needs the stream-restore module these days
+
+  * Unit Tests: Disable notification tests that can not be fixed now. Most of them are phone related and depends on liburl-dispatcher library which was dropped from code since it is no longer in the universe repository. See https://bazaar.launchpad.net/~indicator-applet-developers/indicator-sound/trunk.16.10/revision/564
+
+  * Unit Tests: Disable indicator tests that can not be fixed now. These tests needs to be re-enabled later
+   - tests/indicator-test.cc:PhoneMenu
+   - tests/indicator-test.cc:DesktopMenu
+   - tests/indicator-test.cc:BaseActions
+   - tests/integration/test-indicator.cpp:All tests
+   - tests/volume-control-test.cc:BasicObject
+
+  * debian/rules: Re enable live tests logs
+
+ -- Khurshid Alam <[e-mail]>  Thu, 30 Sep 2021 02:12:26 +0530
+
 indicator-sound (12.10.2+18.10.20180612-0ubuntu3) groovy; urgency=medium
 
   * Drop url-dispatcher based Unity8 support. ubuntu-app-launch &
 
=== modified file 'debian/control'
--- debian/control	2020-06-04 12:59:23 +0000
+++ debian/control	2021-09-29 20:46:45 +0000
@@ -22,6 +22,7 @@
                libdbustest1-dev (>= 15.04.0),
                libgirepository1.0-dev,
                libglib2.0-dev (>= 2.32.0),
+               libgmock-dev,
                libqtdbusmock1-dev (>= 0.3),
                libqtdbustest1-dev,
                libunity-api-dev,
@@ -32,7 +33,6 @@
                libxml2-dev,
                pulseaudio,
                python3-dbusmock,
-               qt5-default,
                qtbase5-dev,
                qtbase5-dev-tools,
                qtdeclarative5-dev,
 
=== modified file 'debian/rules'
--- debian/rules	2020-06-04 12:59:23 +0000
+++ debian/rules	2021-09-29 20:46:45 +0000
@@ -17,5 +17,6 @@
 	install -m 644 debian/indicator-sound-crashdb.conf debian/indicator-sound/etc/apport/crashdb.conf.d/
 	dh_install --fail-missing
 
+# For live test logs:
 override_dh_auto_test:
-	-timeout 10m dh_auto_test
+	ARGS=-V dh_auto_test
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2020-06-04 12:59:23 +0000
+++ src/CMakeLists.txt	2021-09-29 20:46:45 +0000
@@ -31,7 +31,6 @@
     accounts-service
   OPTIONS
     --ccode
-    --thread
     --target-glib=${GLIB_2_0_REQUIRED_VERSION}
     --vapidir=${CMAKE_SOURCE_DIR}/vapi/
     --vapidir=.
 
=== modified file 'src/accounts-service-access.vala'
--- src/accounts-service-access.vala	2016-03-03 08:59:37 +0000
+++ src/accounts-service-access.vala	2021-09-29 20:46:45 +0000
@@ -25,7 +25,7 @@
 [DBus (name="com.canonical.UnityGreeter.List")]
 interface GreeterListInterfaceAccess : Object
 {
-	public abstract async string get_active_entry () throws IOError;
+	public abstract async string get_active_entry () throws GLib.DBusError, GLib.IOError;
 	public signal void entry_selected (string entry_name);
 }
 
@@ -130,7 +130,7 @@
 		// Get master AccountsService object
 		DBusProxy accounts_proxy;
 		try {
-			accounts_proxy = yield DBusProxy.create_for_bus (BusType.SYSTEM, DBusProxyFlags.DO_NOT_LOAD_PROPERTIES | DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, null, "org.freedesktop.Accounts", "/org/freedesktop/Accounts", "org.freedesktop.Accounts");
+			accounts_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.DO_NOT_LOAD_PROPERTIES | DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, null, "org.freedesktop.Accounts", "/org/freedesktop/Accounts", "org.freedesktop.Accounts");
 		} catch (GLib.Error e) {
 			warning ("unable to get greeter proxy: %s", e.message);
 			return;
@@ -142,7 +142,7 @@
 			string user_path;
 			if (user_path_variant.check_format_string ("(o)", true)) {
 				user_path_variant.get ("(o)", out user_path);
-				_user_proxy = yield DBusProxy.create_for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "com.ubuntu.AccountsService.Sound");
+				_user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "com.ubuntu.AccountsService.Sound");
 			} else {
 				warning ("Unable to find user name after calling FindUserByName. Expected type: %s and obtained %s", "(o)", user_path_variant.get_type_string () );
 				return;
 
=== modified file 'src/freedesktop-interfaces.vala'
--- src/freedesktop-interfaces.vala	2011-01-09 15:30:29 +0000
+++ src/freedesktop-interfaces.vala	2021-09-29 20:46:45 +0000
@@ -19,7 +19,7 @@
 
 [DBus (name = "org.freedesktop.DBus")]
 public interface FreeDesktopObject: Object {
-  public abstract async string[] list_names() throws IOError;
+  public abstract async string[] list_names() throws GLib.DBusError, GLib.IOError;
   public abstract signal void name_owner_changed ( string name,
                                                    string old_owner,
                                                    string new_owner );
@@ -27,7 +27,7 @@
 
 [DBus (name = "org.freedesktop.DBus.Introspectable")]
 public interface FreeDesktopIntrospectable: Object {
-  public abstract string Introspect() throws IOError;
+  public abstract string Introspect() throws GLib.DBusError, GLib.IOError;
 }
 
 [DBus (name = "org.freedesktop.DBus.Properties")]
 
=== modified file 'src/greeter-broadcast.vala'
--- src/greeter-broadcast.vala	2014-03-13 18:38:55 +0000
+++ src/greeter-broadcast.vala	2021-09-29 20:46:45 +0000
@@ -20,11 +20,11 @@
 [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;
+  // unused public abstract async void RequestApplicationStart(string name, string appid) throws GLib.Error;
+  // unused public abstract async void RequestHomeShown(string name) throws GLib.Error;
+  public abstract async void RequestSoundPlayPause(string name) throws GLib.DBusError, GLib.IOError;
+  public abstract async void RequestSoundNext(string name) throws GLib.DBusError, GLib.IOError;
+  public abstract async void RequestSoundPrev(string name) throws GLib.DBusError, GLib.IOError;
   // signals
   // unused public signal void StartApplication(string username, string appid);
   // unused public signal void ShowHome(string username);
 
=== modified 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	2021-09-29 20:46:45 +0000
@@ -19,7 +19,7 @@
 
 [DBus (name="com.canonical.UnityGreeter.List")]
 public interface UnityGreeterList : Object {
-	public abstract async string get_active_entry () throws IOError;
+	public abstract async string get_active_entry () throws GLib.DBusError, GLib.IOError;
 	public signal void entry_selected (string entry_name);
 }
 
@@ -45,8 +45,12 @@
 			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);
+					var list = (obj as UnityGreeterList);
+
+					if (list != null) {
+						var value = list.get_active_entry.end(res);
+						active_user_changed(value);
+					}
 				} catch (Error e) {
 					warning("Unable to get active entry: %s", e.message);
 				}
 
=== modified file 'src/media-player-list-mpris.vala'
--- src/media-player-list-mpris.vala	2014-02-25 22:47:45 +0000
+++ src/media-player-list-mpris.vala	2021-09-29 20:46:45 +0000
@@ -94,7 +94,7 @@
 	public override void sync (string[] desktop_ids) {
 
 		/* hash desktop_ids for faster lookup */
-		var hash = new HashTable<string, unowned string> (str_hash, str_equal);
+		var hash = new GenericSet<string> (str_hash, str_equal);
 		foreach (var id in desktop_ids)
 			hash.add (id);
 
 
=== modified file 'src/media-player-mpris.vala'
--- src/media-player-mpris.vala	2017-06-16 17:39:00 +0000
+++ src/media-player-mpris.vala	2021-09-29 20:46:45 +0000
@@ -146,7 +146,7 @@
 				this.state = "Launching";
 			}
 			else if (this.root != null && this.root.CanRaise) {
-				this.root.Raise ();
+				this.root.Raise.begin ();
 			}
 		}
 		catch (Error e) {
 
=== modified file 'src/media-player-user.vala'
--- src/media-player-user.vala	2015-12-29 17:05:16 +0000
+++ src/media-player-user.vala	2021-09-29 20:46:45 +0000
@@ -238,7 +238,11 @@
 		if (this.greeter != null) {
 			this.greeter.RequestSoundPlayPause.begin(this.username, (obj, res) => {
 				try {
-					(obj as GreeterBroadcast).RequestSoundPlayPause.end(res);
+					var broadcasts = (obj as GreeterBroadcast);
+
+					if (broadcasts != null) {
+						broadcasts.RequestSoundPlayPause.end(res);
+					}
 				} catch (Error e) {
 					warning("Unable to send play pause: %s", e.message);
 				}
@@ -253,7 +257,11 @@
 		if (this.greeter != null) {
 			this.greeter.RequestSoundNext.begin(this.username, (obj, res) => {
 				try {
-					(obj as GreeterBroadcast).RequestSoundNext.end(res);
+					var broadcasts = (obj as GreeterBroadcast);
+
+					if (broadcasts != null) {
+						broadcasts.RequestSoundNext.end(res);
+					}
 				} catch (Error e) {
 					warning("Unable to send next: %s", e.message);
 				}
@@ -268,7 +276,11 @@
 		if (this.greeter != null) {
 			this.greeter.RequestSoundPrev.begin(this.username, (obj, res) => {
 				try {
-					(obj as GreeterBroadcast).RequestSoundPrev.end(res);
+					var broadcasts = (obj as GreeterBroadcast);
+
+					if (broadcasts != null) {
+						broadcasts.RequestSoundPrev.end(res);
+					}
 				} catch (Error e) {
 					warning("Unable to send previous: %s", e.message);
 				}
 
=== modified file 'src/mpris2-interfaces.vala'
--- src/mpris2-interfaces.vala	2015-12-29 02:33:24 +0000
+++ src/mpris2-interfaces.vala	2021-09-29 20:46:45 +0000
@@ -28,8 +28,8 @@
   public abstract string Identity{owned get; set;}
   public abstract string DesktopEntry{owned get; set;}
   // methods
-  public abstract async void Quit() throws IOError;
-  public abstract async void Raise() throws IOError;
+  public abstract async void Quit() throws GLib.Error;
+  public abstract async void Raise() throws GLib.Error;
 }
 
 [DBus (name = "org.mpris.MediaPlayer2.Player")]
@@ -42,10 +42,10 @@
   public abstract bool CanGoNext{owned get; set;}
   public abstract bool CanGoPrevious{owned get; set;}
   // methods
-  public abstract async void PlayPause() throws IOError;
-  public abstract async void Next() throws IOError;
-  public abstract async void Previous() throws IOError;
-  public abstract async void Seek(int64 offset) throws IOError;
+  public abstract async void PlayPause() throws GLib.Error;
+  public abstract async void Next() throws GLib.Error;
+  public abstract async void Previous() throws GLib.Error;
+  public abstract async void Seek(int64 offset) throws GLib.Error;
   // signals
   public signal void Seeked(int64 new_position);
 }
@@ -71,11 +71,11 @@
   public abstract ActivePlaylistContainer? ActivePlaylist {owned get; set;}
   
   //methods
-  public abstract async void ActivatePlaylist(ObjectPath playlist_id) throws IOError;
+  public abstract async void ActivatePlaylist(ObjectPath playlist_id) throws GLib.Error;
   public abstract async PlaylistDetails[]? GetPlaylists ( uint32 index,
                                                           uint32 max_count,
                                                           string order,
-                                                          bool reverse_order ) throws IOError;
+                                                          bool reverse_order ) throws GLib.Error;
   //signals
   public signal void PlaylistChanged (PlaylistDetails details);
   
 
=== modified file 'src/notification.vala'
--- src/notification.vala	2020-04-03 08:29:33 +0000
+++ src/notification.vala	2021-09-29 20:46:45 +0000
@@ -19,7 +19,7 @@
 
 public abstract class IndicatorSound.Notification: Object
 {
-	protected Notification () {
+	internal Notification () {
 		BusWatcher.watch_namespace (
 			GLib.BusType.SESSION,
 			"org.freedesktop.Notifications",
 
=== modified file 'src/options-gsettings.vala'
--- src/options-gsettings.vala	2015-12-31 17:13:18 +0000
+++ src/options-gsettings.vala	2021-09-29 20:46:45 +0000
@@ -35,9 +35,9 @@
 
         /** MAX VOLUME PROPERTY **/
 
-	private static const string AMP_dB_KEY = "amplified-volume-decibels";
-	private static const string NORMAL_dB_KEY = "normal-volume-decibels";
-	private static const string ALLOW_AMP_KEY = "allow-amplified-volume";
+	private const string AMP_dB_KEY = "amplified-volume-decibels";
+	private const string NORMAL_dB_KEY = "normal-volume-decibels";
+	private const string ALLOW_AMP_KEY = "allow-amplified-volume";
 
         private void init_max_volume() {
                 _settings.changed[NORMAL_dB_KEY].connect(() => update_max_volume());
@@ -66,8 +66,8 @@
 
 	/** LOUD VOLUME **/
 
-	private static const string LOUD_ENABLED_KEY = "warning-volume-enabled";
-	private static const string LOUD_DECIBEL_KEY = "warning-volume-decibels";
+	private const string LOUD_ENABLED_KEY = "warning-volume-enabled";
+	private const string LOUD_DECIBEL_KEY = "warning-volume-decibels";
 
         private void init_loud_volume() {
                 _settings.changed[LOUD_ENABLED_KEY].connect(() => update_loud_volume());
 
=== modified file 'src/sound-menu.vala'
--- src/sound-menu.vala	2016-03-02 13:50:43 +0000
+++ src/sound-menu.vala	2021-09-29 20:46:45 +0000
@@ -271,6 +271,8 @@
 				case VolumeControl.ActiveOutput.HDMI_HEADPHONES:
 					label = _("Volume (HDMI headphones)");
 					break;
+				case VolumeControl.ActiveOutput.CALL_MODE:
+					break;
 			}
 			this.volume_section.remove (index);
 			this.volume_section.insert_item (index, this.create_slider_menu_item (_(label), "indicator.volume(0)", 0.0, 1.0, 0.01,
 
=== modified file 'src/volume-control-pulse.vala'
--- src/volume-control-pulse.vala	2017-06-16 17:39:00 +0000
+++ src/volume-control-pulse.vala	2021-09-29 20:46:45 +0000
@@ -201,8 +201,14 @@
 						this._source_sink_mic_activated = false;
 						this.active_mic = _external_mic_detected;
 						break;
+
+					default:
+						break;
 				}
 				break;
+
+			default:
+				break;
 		}
 	}
 
 
=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2020-04-03 08:29:33 +0000
+++ src/volume-control.vala	2021-09-29 20:46:45 +0000
@@ -54,7 +54,7 @@
 
 	protected IndicatorSound.Options _options = null;
 
-	protected VolumeControl (IndicatorSound.Options options) {
+	internal VolumeControl(IndicatorSound.Options options) {
 		_options = options;
 	}
 
 
=== modified file 'src/volume-warning.vala'
--- src/volume-warning.vala	2020-04-03 08:29:33 +0000
+++ src/volume-warning.vala	2021-09-29 20:46:45 +0000
@@ -44,7 +44,8 @@
 		}
 	}
 
-	protected VolumeWarning (IndicatorSound.Options options) {
+	internal VolumeWarning (IndicatorSound.Options options) {
+
 		_options = options;
 
 		init_high_volume ();
@@ -132,7 +133,7 @@
 	**/
 
 	private Settings _settings = new Settings ("com.canonical.indicator.sound");
-	private static const string TTL_KEY = "warning-volume-confirmation-ttl";
+	private const string TTL_KEY = "warning-volume-confirmation-ttl";
 	private uint _approved_timer = 0;
 	private int64 _approved_at = 0;
 	private int64 _approved_ttl_usec = 0;
@@ -213,7 +214,7 @@
 			approve_high_volume ();
 			sound_system_set_multimedia_volume (_ok_volume);
 		} else {
-			this.cancel_pressed (this.volume_to_double(_options.loud_volume));
+			this.cancel_pressed (VolumeWarning.volume_to_double(_options.loud_volume));
 		}
 
 		_ok_volume = PulseAudio.Volume.INVALID;
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-02-07 21:50:25 +0000
+++ tests/CMakeLists.txt	2021-09-29 20:46:45 +0000
@@ -1,5 +1,6 @@
 find_package(GMock)
 include_directories(${GMOCK_INCLUDE_DIRS})
+include_directories("${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libdbustest-1")
 
 ###########################
 # GSettings Schema
@@ -48,7 +49,6 @@
         indicator-sound-service
     OPTIONS
         --ccode
-        --thread
         --vapidir=${CMAKE_BINARY_DIR}/src/
         --vapidir=${CMAKE_SOURCE_DIR}/vapi/
         --vapidir=.
 
=== modified file 'tests/indicator-test.cc'
--- tests/indicator-test.cc	2015-02-19 16:27:24 +0000
+++ tests/indicator-test.cc	2021-09-29 20:46:45 +0000
@@ -64,7 +64,7 @@
 };
 
 
-TEST_F(IndicatorTest, PhoneMenu) {
+TEST_F(IndicatorTest, DISABLED_PhoneMenu) {
 	setMenu("/com/canonical/indicator/sound/phone");
 
 	EXPECT_EVENTUALLY_MENU_ATTRIB(std::vector<int>({0}), "action", "indicator.root");
@@ -79,7 +79,7 @@
 	EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "label", "Sound Settings…");
 }
 
-TEST_F(IndicatorTest, DesktopMenu) {
+TEST_F(IndicatorTest, DISABLED_DesktopMenu) {
 	setMenu("/com/canonical/indicator/sound/desktop");
 
 	EXPECT_MENU_ATTRIB({0}, "action", "indicator.root");
@@ -94,7 +94,7 @@
 	EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "label", "Sound Settings…");
 }
 
-TEST_F(IndicatorTest, BaseActions) {
+TEST_F(IndicatorTest, DISABLED_BaseActions) {
 	setActions("/com/canonical/indicator/sound");
 
 	ASSERT_ACTION_EXISTS("root");
 
=== modified file 'tests/integration/indicator-sound-test-base.cpp'
--- tests/integration/indicator-sound-test-base.cpp	2018-04-20 20:34:50 +0000
+++ tests/integration/indicator-sound-test-base.cpp	2021-09-29 20:46:45 +0000
@@ -80,8 +80,12 @@
 void IndicatorSoundTestBase::TearDown()
 {
     unsetenv("XDG_DATA_DIRS");
+    unsetenv("XDG_RUNTIME_DIR");
+    unsetenv("XDG_CONFIG_HOME");
+    unsetenv("HOME");
     unsetenv("PULSE_SERVER");
     unsetenv("DBUS_SYSTEM_BUS_ADDRESS");
+    unsetenv("DBUS_SESSION_BUS_ADDRESS");
 }
 
 void gvariant_deleter(GVariant* varptr)
@@ -299,6 +303,7 @@
                                                       << QString("--load=module-null-sink sink_name=indicator_sound_test_mic")
                                                       << "--log-target=file:/tmp/indicator-sound-test-pulse-daemon-desktop.log"
                                                       << "--load=module-dbus-protocol"
+						       << QString("--load=module-stream-restore restore_device=false restore_muted=false fallback_table=\"%1\"").arg(STREAM_RESTORE_TABLE)
                                                       << "--load=module-native-protocol-tcp auth-ip-acl=127.0.0.1"
                 ));
         pulseaudio->start(dbusTestRunner.sessionConnection());
@@ -408,8 +413,8 @@
             .double_attribute("max-value", 1.0)
             .double_attribute("step", 0.01)
             .string_attribute("x-canonical-type", "com.canonical.unity.slider")
-            .themed_icon("max-icon", {"audio-volume-high-panel", "audio-volume-high", "audio-volume", "audio"})
-            .themed_icon("min-icon", {"audio-volume-low-zero-panel", "audio-volume-low-zero", "audio-volume-low", "audio-volume", "audio"})
+            .themed_icon("max-icon", {"audio-volume-high-panel", "audio-volume-high", "audio-volume", "audio", "audio-volume-high-panel-symbolic", "audio-volume-high-symbolic", "audio-volume-symbolic", "audio-symbolic"})
+            .themed_icon("min-icon", {"audio-volume-low-zero-panel", "audio-volume-low-zero", "audio-volume-low", "audio-volume", "audio", "audio-volume-low-zero-panel-symbolic", "audio-volume-low-zero-symbolic", "audio-volume-low-symbolic", "audio-volume-symbolic", "audio-symbolic"})
             .pass_through_double_attribute("action", volume);
 }
 
 
=== modified file 'tests/integration/test-indicator.cpp'
--- tests/integration/test-indicator.cpp	2016-03-17 10:04:53 +0000
+++ tests/integration/test-indicator.cpp	2021-09-29 20:46:45 +0000
@@ -32,7 +32,7 @@
 {
 };
 
-TEST_F(TestIndicator, PhoneCheckRootIcon)
+TEST_F(TestIndicator, DISABLED_PhoneCheckRootIcon)
 {
     double INITIAL_VOLUME = 0.0;
 
@@ -68,10 +68,10 @@
                 )
             ).match());
 
-    QStringList mutedIcon = {"audio-volume-muted-panel", "audio-volume-muted", "audio-volume", "audio"};
+    QStringList mutedIcon = {"audio-volume-muted-panel", "audio-volume-muted", "audio-volume", "audio", "audio-volume-muted-panel-symbolic", "audio-volume-muted-symbolic", "audio-volume-symbolic", "audio-symbolic"};
     EXPECT_EQ(getRootIconValue(), mutedIcon);
 
-    QStringList lowVolumeIcon = {"audio-volume-low-panel", "audio-volume-low", "audio-volume", "audio"};
+    QStringList lowVolumeIcon = {"audio-volume-low-panel", "audio-volume-low", "audio-volume", "audio", "audio-volume-low-panel-symbolic", "audio-volume-low-symbolic", "audio-volume-symbolic", "audio-symbolic"};
     for( double volume = 0.1; volume <= 0.3; volume+=0.1)
     {
         EXPECT_TRUE(setStreamRestoreVolume("alert", volume));
@@ -79,14 +79,14 @@
     }
     EXPECT_TRUE(setStreamRestoreVolume("alert", 0.4));
 
-    QStringList mediumVolumeIcon = {"audio-volume-medium-panel", "audio-volume-medium", "audio-volume", "audio"};
+    QStringList mediumVolumeIcon = {"audio-volume-medium-panel", "audio-volume-medium", "audio-volume", "audio", "audio-volume-medium-panel-symbolic", "audio-volume-medium-symbolic", "audio-volume-symbolic", "audio-symbolic"};
     for( double volume = 0.4; volume <= 0.7; volume+=0.1)
     {
         EXPECT_TRUE(setStreamRestoreVolume("alert", volume));
         EXPECT_EQ(getRootIconValue(), mediumVolumeIcon);
     }
 
-    QStringList highVolumeIcon = {"audio-volume-high-panel", "audio-volume-high", "audio-volume", "audio"};
+    QStringList highVolumeIcon = {"audio-volume-high-panel", "audio-volume-high", "audio-volume", "audio", "audio-volume-high-panel-symbolic", "audio-volume-high-symbolic", "audio-volume-symbolic", "audio-symbolic"};
     for( double volume = 0.8; volume <= 1.0; volume+=0.1)
     {
         EXPECT_TRUE(setStreamRestoreVolume("alert", volume));
@@ -94,7 +94,7 @@
     }
 }
 
-TEST_F(TestIndicator, PhoneTestExternalMicInOut)
+TEST_F(TestIndicator, DISABLED_PhoneTestExternalMicInOut)
 {
     double INITIAL_VOLUME = 0.0;
 
@@ -178,7 +178,7 @@
         ).match());
 }
 
-TEST_F(TestIndicator, DesktopTestExternalMicInOut)
+TEST_F(TestIndicator, DISABLED_DesktopTestExternalMicInOut)
 {
     double INITIAL_VOLUME = 0.0;
 
@@ -371,7 +371,7 @@
         ).match());
 }
 
-TEST_F(TestIndicator, PhoneBasicInitialVolume)
+TEST_F(TestIndicator, DISABLED_PhoneBasicInitialVolume)
 {
     double INITIAL_VOLUME = 0.0;
 
@@ -406,7 +406,7 @@
         ).match());
 }
 
-TEST_F(TestIndicator, PhoneAddMprisPlayer)
+TEST_F(TestIndicator, DISABLED_PhoneAddMprisPlayer)
 {
     double INITIAL_VOLUME = 0.0;
 
@@ -469,7 +469,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -486,7 +486,7 @@
         ).match());
 }
 
-TEST_F(TestIndicator, DesktopBasicInitialVolume)
+TEST_F(TestIndicator, DISABLED_DesktopBasicInitialVolume)
 {
     double INITIAL_VOLUME = 0.0;
 
@@ -523,7 +523,7 @@
                     .item(mh::MenuItemMatcher()
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
-                        .themed_icon("icon", {"testplayer"})
+                        .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
                     .item(mh::MenuItemMatcher()
@@ -539,7 +539,7 @@
         ).match());
 }
 
-TEST_F(TestIndicator, DesktopAddMprisPlayer)
+TEST_F(TestIndicator, DISABLED_DesktopAddMprisPlayer)
 {
     double INITIAL_VOLUME = 0.0;
 
@@ -577,7 +577,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -614,7 +614,7 @@
                     .item(mh::MenuItemMatcher()
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
-                        .themed_icon("icon", {"testplayer"})
+                        .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
                     .item(mh::MenuItemMatcher()
@@ -628,7 +628,7 @@
             ).match());
 }
 
-TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
+TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
 {
     double INITIAL_VOLUME = 0.0;
 
@@ -666,7 +666,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -704,7 +704,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -719,7 +719,7 @@
                         .item(mh::MenuItemMatcher()
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
-                            .themed_icon("icon", {"testplayer"})
+                            .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                             .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                         )
                         .item(mh::MenuItemMatcher()
@@ -757,7 +757,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -772,7 +772,7 @@
                         .item(mh::MenuItemMatcher()
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
-                            .themed_icon("icon", {"testplayer"})
+                            .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                             .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                         )
                         .item(mh::MenuItemMatcher()
@@ -787,7 +787,7 @@
                         .item(mh::MenuItemMatcher()
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
-                            .themed_icon("icon", {"testplayer"})
+                            .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                             .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                         )
                         .item(mh::MenuItemMatcher()
@@ -825,7 +825,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -840,7 +840,7 @@
                         .item(mh::MenuItemMatcher()
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
-                            .themed_icon("icon", {"testplayer"})
+                            .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                             .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                         )
                         .item(mh::MenuItemMatcher()
@@ -855,7 +855,7 @@
                         .item(mh::MenuItemMatcher()
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
-                            .themed_icon("icon", {"testplayer"})
+                            .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                             .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                         )
                     )
@@ -886,7 +886,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -901,7 +901,7 @@
                         .item(mh::MenuItemMatcher()
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
-                            .themed_icon("icon", {"testplayer"})
+                            .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                             .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                         )
                     )
@@ -910,7 +910,7 @@
                         .item(mh::MenuItemMatcher()
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
-                            .themed_icon("icon", {"testplayer"})
+                            .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                             .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                         )
                     )
@@ -942,7 +942,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -957,7 +957,7 @@
                         .item(mh::MenuItemMatcher()
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
-                            .themed_icon("icon", {"testplayer"})
+                            .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                             .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                         )
                     )
@@ -966,7 +966,7 @@
                         .item(mh::MenuItemMatcher()
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
-                            .themed_icon("icon", {"testplayer"})
+                            .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                             .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                         )
                     )
@@ -998,7 +998,7 @@
                     .item(mh::MenuItemMatcher()
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
-                        .themed_icon("icon", {"testplayer"})
+                        .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
             )
@@ -1007,7 +1007,7 @@
                     .item(mh::MenuItemMatcher()
                         .action("indicator.testplayer2.desktop")
                         .label("TestPlayer2")
-                        .themed_icon("icon", {"testplayer"})
+                        .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
                 )
@@ -1016,7 +1016,7 @@
                     .item(mh::MenuItemMatcher()
                         .action("indicator.testplayer3.desktop")
                         .label("TestPlayer3")
-                        .themed_icon("icon", {"testplayer"})
+                        .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
                     .item(mh::MenuItemMatcher()
@@ -1054,7 +1054,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -1069,7 +1069,7 @@
                         .item(mh::MenuItemMatcher()
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
-                            .themed_icon("icon", {"testplayer"})
+                            .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                             .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                         )
                         .item(mh::MenuItemMatcher()
@@ -1084,7 +1084,7 @@
                         .item(mh::MenuItemMatcher()
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
-                            .themed_icon("icon", {"testplayer"})
+                            .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                             .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                         )
                         .item(mh::MenuItemMatcher()
@@ -1125,7 +1125,7 @@
                     .item(mh::MenuItemMatcher()
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
-                        .themed_icon("icon", {"testplayer"})
+                        .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
             )
@@ -1134,7 +1134,7 @@
                     .item(mh::MenuItemMatcher()
                         .action("indicator.testplayer2.desktop")
                         .label("TestPlayer2")
-                        .themed_icon("icon", {"testplayer"})
+                        .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
                 )
@@ -1143,7 +1143,7 @@
                     .item(mh::MenuItemMatcher()
                         .action("indicator.testplayer3.desktop")
                         .label("TestPlayer3")
-                        .themed_icon("icon", {"testplayer"})
+                        .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
                     .item(mh::MenuItemMatcher()
@@ -1185,7 +1185,7 @@
                     .item(mh::MenuItemMatcher()
                         .action("indicator.testplayer3.desktop")
                         .label("TestPlayer3")
-                        .themed_icon("icon", {"testplayer"})
+                        .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
                     .item(mh::MenuItemMatcher()
@@ -1198,7 +1198,7 @@
                     .item(mh::MenuItemMatcher()
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
-                        .themed_icon("icon", {"testplayer"})
+                        .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
             )
@@ -1207,7 +1207,7 @@
                     .item(mh::MenuItemMatcher()
                         .action("indicator.testplayer2.desktop")
                         .label("TestPlayer2")
-                        .themed_icon("icon", {"testplayer"})
+                        .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
                 )
@@ -1218,7 +1218,7 @@
 
 }
 
-TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
+TEST_F(TestIndicator, DISABLED_DesktopMprisPlayerButtonsState)
 {
     double INITIAL_VOLUME = 0.0;
 
@@ -1256,7 +1256,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -1294,7 +1294,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -1333,7 +1333,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -1371,7 +1371,7 @@
                 .item(mh::MenuItemMatcher()
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
-                    .themed_icon("icon", {"testplayer"})
+                    .themed_icon("icon", {"testplayer", "testplayer-symbolic"})
                     .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
@@ -1387,7 +1387,7 @@
         ).match());
 }
 
-TEST_F(TestIndicator, DesktopChangeRoleVolume)
+TEST_F(TestIndicator, DISABLED_DesktopChangeRoleVolume)
 {
     double INITIAL_VOLUME = 0.0;
 
 
=== modified file 'tests/notifications-test.cc'
--- tests/notifications-test.cc	2017-08-04 11:51:07 +0000
+++ tests/notifications-test.cc	2021-09-29 20:46:45 +0000
@@ -227,7 +227,7 @@
 
 };
 
-TEST_F(NotificationsTest, BasicObject) {
+TEST_F(NotificationsTest, DISABLED_BasicObject) {
     auto options = optionsMock();
     auto volumeControl = volumeControlMock(options);
     auto volumeWarning = volumeWarningMock(options);
@@ -240,7 +240,7 @@
     /* Auto free */
 }
 
-TEST_F(NotificationsTest, VolumeChanges) {
+TEST_F(NotificationsTest, DISABLED_VolumeChanges) {
     auto options = optionsMock();
     auto volumeControl = volumeControlMock(options);
     auto volumeWarning = volumeWarningMock(options);
@@ -282,7 +282,7 @@
     ASSERT_EQ(0, notev.size());
 }
 
-TEST_F(NotificationsTest, StreamChanges) {
+TEST_F(NotificationsTest, DISABLED_StreamChanges) {
     auto options = optionsMock();
     auto volumeControl = volumeControlMock(options);
     auto volumeWarning = volumeWarningMock(options);
@@ -323,7 +323,7 @@
     EXPECT_GVARIANT_EQ("@i 65", notev[0].hints["value"]);
 }
 
-TEST_F(NotificationsTest, IconTesting) {
+TEST_F(NotificationsTest, DISABLED_IconTesting) {
     auto options = optionsMock();
     auto volumeControl = volumeControlMock(options);
     auto volumeWarning = volumeWarningMock(options);
@@ -360,7 +360,7 @@
     EXPECT_EQ("audio-volume-high",   notev[10].app_icon);
 }
 
-TEST_F(NotificationsTest, ServerRestart) {
+TEST_F(NotificationsTest, DISABLED_ServerRestart) {
     auto options = optionsMock();
     auto volumeControl = volumeControlMock(options);
     auto volumeWarning = volumeWarningMock(options);
@@ -410,7 +410,7 @@
     ASSERT_EQ(1, notev.size());
 }
 
-TEST_F(NotificationsTest, HighVolume) {
+TEST_F(NotificationsTest, DISABLED_HighVolume) {
     auto options = optionsMock();
     auto volumeControl = volumeControlMock(options);
     auto volumeWarning = volumeWarningMock(options);
@@ -455,7 +455,7 @@
     EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]);
 }
 
-TEST_F(NotificationsTest, MenuHide) {
+TEST_F(NotificationsTest, DISABLED_MenuHide) {
     auto options = optionsMock();
     auto volumeControl = volumeControlMock(options);
     auto volumeWarning = volumeWarningMock(options);
@@ -488,7 +488,7 @@
     EXPECT_EQ(1, notev.size());
 }
 
-TEST_F(NotificationsTest, ExtendendVolumeNotification) {
+TEST_F(NotificationsTest, DISABLED_ExtendendVolumeNotification) {
     auto options = optionsMock();
     auto volumeControl = volumeControlMock(options);
     auto volumeWarning = volumeWarningMock(options);
@@ -533,7 +533,7 @@
     EXPECT_GVARIANT_EQ("@i 100", notev[0].hints["value"]);
 }
 
-TEST_F(NotificationsTest, TriggerWarning) {
+TEST_F(NotificationsTest, DISABLED_TriggerWarning) {
 
     // Tests all the conditions needed to trigger a volume warning.
     // There are many possible combinations, so this test is slow. :P
 
=== modified file 'tests/volume-control-test.cc'
--- tests/volume-control-test.cc	2016-02-23 12:48:46 +0000
+++ tests/volume-control-test.cc	2021-09-29 20:46:45 +0000
@@ -75,7 +75,7 @@
         }
 };
 
-TEST_F(VolumeControlTest, BasicObject) {
+TEST_F(VolumeControlTest, DISABLED_BasicObject) {
     auto options = options_mock_new();
     auto pgloop = pa_glib_mainloop_new(NULL);
     auto accounts_service_access = accounts_service_access_new();