From b29f9e10c4ada28a07a9c977e9032d834795aa76 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 13 Mar 2015 21:18:28 +0100
Subject: [PATCH] core: get_mute() with no mixer returns None

...and not False, because the mute state is unknown (None) and not
unmuted (False) when there is no mixer.

Note that this change does not affect the MPD responses.
---
 mopidy/core/mixer.py                    |  4 +---
 tests/core/test_mixer.py                | 12 ++++++------
 tests/mpd/protocol/test_audio_output.py | 10 ++++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/mopidy/core/mixer.py b/mopidy/core/mixer.py
index 224c09df..3388d706 100644
--- a/mopidy/core/mixer.py
+++ b/mopidy/core/mixer.py
@@ -42,9 +42,7 @@ class MixerController(object):
         :class:`True` if muted, :class:`False` unmuted, :class:`None` if
         unknown.
         """
-        if self._mixer is None:
-            return False
-        else:
+        if self._mixer is not None:
             return self._mixer.get_mute().get()
 
     def set_mute(self, mute):
diff --git a/tests/core/test_mixer.py b/tests/core/test_mixer.py
index 6485f3e8..c4126eaa 100644
--- a/tests/core/test_mixer.py
+++ b/tests/core/test_mixer.py
@@ -42,17 +42,17 @@ class CoreNoneMixerTest(unittest.TestCase):
     def setUp(self):  # noqa: N802
         self.core = core.Core(mixer=None, backends=[])
 
-    def test_get_volume_return_none(self):
+    def test_get_volume_return_none_because_it_is_unknown(self):
         self.assertEqual(self.core.mixer.get_volume(), None)
 
-    def test_set_volume_return_false(self):
+    def test_set_volume_return_false_because_it_failed(self):
         self.assertEqual(self.core.mixer.set_volume(30), False)
 
-    def test_get_set_mute_return_proper_state(self):
-        self.assertEqual(self.core.mixer.set_mute(False), False)
-        self.assertEqual(self.core.mixer.get_mute(), False)
+    def test_get_mute_return_none_because_it_is_unknown(self):
+        self.assertEqual(self.core.mixer.get_mute(), None)
+
+    def test_set_mute_return_false_because_it_failed(self):
         self.assertEqual(self.core.mixer.set_mute(True), False)
-        self.assertEqual(self.core.mixer.get_mute(), False)
 
 
 @mock.patch.object(mixer.MixerListener, 'send')
diff --git a/tests/mpd/protocol/test_audio_output.py b/tests/mpd/protocol/test_audio_output.py
index 322bf181..b42b4c56 100644
--- a/tests/mpd/protocol/test_audio_output.py
+++ b/tests/mpd/protocol/test_audio_output.py
@@ -90,20 +90,22 @@ class AudioOutputHandlerNoneMixerTest(protocol.BaseTestCase):
     enable_mixer = False
 
     def test_enableoutput(self):
-        self.core.mixer.set_mute(False)
+        self.assertEqual(self.core.mixer.get_mute().get(), None)
 
         self.send_request('enableoutput "0"')
         self.assertInResponse(
             'ACK [52@0] {enableoutput} problems enabling output')
-        self.assertEqual(self.core.mixer.get_mute().get(), False)
+
+        self.assertEqual(self.core.mixer.get_mute().get(), None)
 
     def test_disableoutput(self):
-        self.core.mixer.set_mute(True)
+        self.assertEqual(self.core.mixer.get_mute().get(), None)
 
         self.send_request('disableoutput "0"')
         self.assertInResponse(
             'ACK [52@0] {disableoutput} problems disabling output')
-        self.assertEqual(self.core.mixer.get_mute().get(), False)
+
+        self.assertEqual(self.core.mixer.get_mute().get(), None)
 
     def test_outputs_when_unmuted(self):
         self.core.mixer.set_mute(False)