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

core: Correct volume/mute return values

Browse Source
This commit is contained in:
Thomas Adamcik 2015-05-07 00:13:58 +02:00
parent cfd4dcb8dd
commit 29c66f7bc8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mopidy/core/mixer.py
View File

@ -57,14 +57,14 @@ class MixerController(object):
validation.check_integer(volume, min=0, max=100)
if self._mixer is None:
return False
return False # TODO: 2.0 return None
with _mixer_error_handling(self._mixer):
result = self._mixer.set_volume(volume).get()
validation.check_instance(result, bool)
return result
return None
return False
def get_mute(self):
"""Get mute state.
@ -91,11 +91,11 @@ class MixerController(object):
"""
validation.check_boolean(mute)
if self._mixer is None:
return False
return False # TODO: 2.0 return None
with _mixer_error_handling(self._mixer):
result = self._mixer.set_mute(bool(mute)).get()
validation.check_instance(result, bool)
return result
return None
return False

4
tests/core/test_mixer.py
View File

@ -131,7 +131,7 @@ class SetVolumeBadBackendTest(MockBackendCoreMixerBase):
def test_backend_returns_wrong_type(self):
self.mixer.set_volume.return_value.get.return_value = 'done'
self.assertIs(self.core.mixer.set_volume(30), None)
self.assertFalse(self.core.mixer.set_volume(30))
class GetMuteBadBackendTest(MockBackendCoreMixerBase):
@ -153,4 +153,4 @@ class SetMuteBadBackendTest(MockBackendCoreMixerBase):
def test_backend_returns_wrong_type(self):
self.mixer.set_mute.return_value.get.return_value = 'done'
self.assertIs(self.core.mixer.set_mute(True), None)
self.assertFalse(self.core.mixer.set_mute(True))