From 160afbcd265cfc0602213f7b07c6e4fa92f82cf2 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Fri, 13 Feb 2015 01:14:36 +0100 Subject: [PATCH] mpd: Use DummyMixer in tests --- mopidy/mixer.py | 22 ++++++++++++++++++++++ tests/mpd/protocol/__init__.py | 6 ++++-- tests/mpd/test_status.py | 6 ++++-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/mopidy/mixer.py b/mopidy/mixer.py index e277fe55..b9fc41ca 100644 --- a/mopidy/mixer.py +++ b/mopidy/mixer.py @@ -2,6 +2,8 @@ from __future__ import absolute_import, unicode_literals import logging +import pykka + from mopidy import listener @@ -147,3 +149,23 @@ class MixerListener(listener.Listener): :type mute: bool """ pass + + +class DummyMixer(pykka.ThreadingActor, Mixer): + + def __init__(self): + super(DummyMixer, self).__init__() + self._volume = None + self._mute = None + + def get_volume(self): + return self._volume + + def set_volume(self, volume): + self._volume = volume + + def get_mute(self): + return self._mute + + def set_mute(self, mute): + self._mute = mute diff --git a/tests/mpd/protocol/__init__.py b/tests/mpd/protocol/__init__.py index 8c7b60f1..ba446cb0 100644 --- a/tests/mpd/protocol/__init__.py +++ b/tests/mpd/protocol/__init__.py @@ -6,7 +6,7 @@ import mock import pykka -from mopidy import core +from mopidy import core, mixer from mopidy.backend import dummy from mopidy.mpd import session, uri_mapper @@ -32,8 +32,10 @@ class BaseTestCase(unittest.TestCase): } def setUp(self): # noqa: N802 + self.mixer = mixer.DummyMixer.start().proxy() self.backend = dummy.create_dummy_backend_proxy() - self.core = core.Core.start(backends=[self.backend]).proxy() + self.core = core.Core.start( + mixer=self.mixer, backends=[self.backend]).proxy() self.uri_map = uri_mapper.MpdUriMapper(self.core) self.connection = MockConnection() diff --git a/tests/mpd/test_status.py b/tests/mpd/test_status.py index 75c10c94..8dbfb1e4 100644 --- a/tests/mpd/test_status.py +++ b/tests/mpd/test_status.py @@ -4,7 +4,7 @@ import unittest import pykka -from mopidy import core +from mopidy import core, mixer from mopidy.backend import dummy from mopidy.core import PlaybackState from mopidy.models import Track @@ -21,8 +21,10 @@ STOPPED = PlaybackState.STOPPED class StatusHandlerTest(unittest.TestCase): def setUp(self): # noqa: N802 + self.mixer = mixer.DummyMixer.start().proxy() self.backend = dummy.create_dummy_backend_proxy() - self.core = core.Core.start(backends=[self.backend]).proxy() + self.core = core.Core.start( + mixer=self.mixer, backends=[self.backend]).proxy() self.dispatcher = dispatcher.MpdDispatcher(core=self.core) self.context = self.dispatcher.context