andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: get_mute() with no mixer returns None

Browse Source 
...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.
This commit is contained in:
Stein Magnus Jodal 2015-03-13 21:18:28 +01:00
parent e4ef6d13ca
commit b29f9e10c4
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/core/mixer.py
View File

@ -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):

12
tests/core/test_mixer.py
View File

@ -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')

10
tests/mpd/protocol/test_audio_output.py
View File

@ -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)