From b554a64aadfc42b5dced8b3431db0a05c852d1c7 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 13 Feb 2015 01:35:07 +0100
Subject: [PATCH] mixer: Move DummyMixer into tests package

---
 mopidy/mixer.py                | 22 ----------------------
 tests/dummy_mixer.py           | 29 +++++++++++++++++++++++++++++
 tests/mpd/protocol/__init__.py |  6 +++---
 tests/mpd/test_status.py       |  6 +++---
 4 files changed, 35 insertions(+), 28 deletions(-)
 create mode 100644 tests/dummy_mixer.py

diff --git a/mopidy/mixer.py b/mopidy/mixer.py
index b9fc41ca..e277fe55 100644
--- a/mopidy/mixer.py
+++ b/mopidy/mixer.py
@@ -2,8 +2,6 @@ from __future__ import absolute_import, unicode_literals
 
 import logging
 
-import pykka
-
 from mopidy import listener
 
 
@@ -149,23 +147,3 @@ 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/dummy_mixer.py b/tests/dummy_mixer.py
new file mode 100644
index 00000000..f7d90b17
--- /dev/null
+++ b/tests/dummy_mixer.py
@@ -0,0 +1,29 @@
+from __future__ import unicode_literals
+
+import pykka
+
+from mopidy import mixer
+
+
+def create_proxy(config=None):
+    return DummyMixer.start(config=None).proxy()
+
+
+class DummyMixer(pykka.ThreadingActor, mixer.Mixer):
+
+    def __init__(self, config):
+        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 ed4920f2..b07a5ba3 100644
--- a/tests/mpd/protocol/__init__.py
+++ b/tests/mpd/protocol/__init__.py
@@ -6,10 +6,10 @@ import mock
 
 import pykka
 
-from mopidy import core, mixer
+from mopidy import core
 from mopidy.mpd import session, uri_mapper
 
-from tests import dummy_backend
+from tests import dummy_backend, dummy_mixer
 
 
 class MockConnection(mock.Mock):
@@ -33,7 +33,7 @@ class BaseTestCase(unittest.TestCase):
         }
 
     def setUp(self):  # noqa: N802
-        self.mixer = mixer.DummyMixer.start().proxy()
+        self.mixer = dummy_mixer.create_proxy()
         self.backend = dummy_backend.create_proxy()
         self.core = core.Core.start(
             mixer=self.mixer, backends=[self.backend]).proxy()
diff --git a/tests/mpd/test_status.py b/tests/mpd/test_status.py
index 069addca..e130353b 100644
--- a/tests/mpd/test_status.py
+++ b/tests/mpd/test_status.py
@@ -4,13 +4,13 @@ import unittest
 
 import pykka
 
-from mopidy import core, mixer
+from mopidy import core
 from mopidy.core import PlaybackState
 from mopidy.models import Track
 from mopidy.mpd import dispatcher
 from mopidy.mpd.protocol import status
 
-from tests import dummy_backend
+from tests import dummy_backend, dummy_mixer
 
 
 PAUSED = PlaybackState.PAUSED
@@ -23,7 +23,7 @@ STOPPED = PlaybackState.STOPPED
 
 class StatusHandlerTest(unittest.TestCase):
     def setUp(self):  # noqa: N802
-        self.mixer = mixer.DummyMixer.start().proxy()
+        self.mixer = dummy_mixer.create_proxy()
         self.backend = dummy_backend.create_proxy()
         self.core = core.Core.start(
             mixer=self.mixer, backends=[self.backend]).proxy()