Simplify DummyBackend instantiation

mopidy/backends/dummy/__init__.py

@@ -2,7 +2,9 @@ from mopidy.backends.base import (Backend, CurrentPlaylistController,
     PlaybackController, BasePlaybackProvider, LibraryController,
     BaseLibraryProvider, StoredPlaylistsController,
     BaseStoredPlaylistsProvider)
+from mopidy.mixers.dummy import DummyMixer
 from mopidy.models import Playlist
+from mopidy.outputs.dummy import DummyOutput
 
 
 class DummyQueue(object):
@@ -22,10 +24,11 @@ class DummyBackend(Backend):
     """
 
     def __init__(self, *args, **kwargs):
+        kwargs['core_queue'] = DummyQueue()
+        kwargs['output'] = DummyOutput(core_queue=DummyQueue())
+        kwargs['mixer_class'] = DummyMixer
         super(DummyBackend, self).__init__(*args, **kwargs)
 
-        self.core_queue = DummyQueue()
-
         self.current_playlist = CurrentPlaylistController(backend=self)
 
         library_provider = DummyLibraryProvider(backend=self)

tests/frontends/mpd/audio_output_test.py

@@ -2,11 +2,10 @@ import unittest
 
 from mopidy.backends.dummy import DummyBackend
 from mopidy.frontends.mpd import dispatcher
-from mopidy.mixers.dummy import DummyMixer
 
 class AudioOutputHandlerTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_enableoutput(self):

tests/frontends/mpd/command_list_test.py

@@ -2,11 +2,10 @@ import unittest
 
 from mopidy.backends.dummy import DummyBackend
 from mopidy.frontends.mpd import dispatcher
-from mopidy.mixers.dummy import DummyMixer
 
 class CommandListsTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_command_list_begin(self):

tests/frontends/mpd/connection_test.py

@@ -2,11 +2,10 @@ import unittest
 
 from mopidy.backends.dummy import DummyBackend
 from mopidy.frontends.mpd import dispatcher
-from mopidy.mixers.dummy import DummyMixer
 
 class ConnectionHandlerTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_close(self):

tests/frontends/mpd/current_playlist_test.py

@@ -2,12 +2,11 @@ import unittest
 
 from mopidy.backends.dummy import DummyBackend
 from mopidy.frontends.mpd import dispatcher
-from mopidy.mixers.dummy import DummyMixer
 from mopidy.models import Track
 
 class CurrentPlaylistHandlerTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_add(self):

tests/frontends/mpd/dispatcher_test.py

@@ -4,11 +4,10 @@ from mopidy.backends.dummy import DummyBackend
 from mopidy.frontends.mpd import dispatcher
 from mopidy.frontends.mpd.exceptions import MpdAckError
 from mopidy.frontends.mpd.protocol import request_handlers, handle_pattern
-from mopidy.mixers.dummy import DummyMixer
 
 class MpdDispatcherTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_register_same_pattern_twice_fails(self):

tests/frontends/mpd/music_db_test.py

@@ -2,11 +2,10 @@ import unittest
 
 from mopidy.backends.dummy import DummyBackend
 from mopidy.frontends.mpd import dispatcher
-from mopidy.mixers.dummy import DummyMixer
 
 class MusicDatabaseHandlerTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_count(self):
@@ -65,7 +64,7 @@ class MusicDatabaseHandlerTest(unittest.TestCase):
 
 class MusicDatabaseFindTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_find_album(self):
@@ -104,7 +103,7 @@ class MusicDatabaseFindTest(unittest.TestCase):
 
 class MusicDatabaseListTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_list_foo_returns_ack(self):
@@ -295,7 +294,7 @@ class MusicDatabaseListTest(unittest.TestCase):
 
 class MusicDatabaseSearchTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_search_album(self):

tests/frontends/mpd/playback_test.py

@@ -2,12 +2,11 @@ import unittest
 
 from mopidy.backends.dummy import DummyBackend
 from mopidy.frontends.mpd import dispatcher
-from mopidy.mixers.dummy import DummyMixer
 from mopidy.models import Track
 
 class PlaybackOptionsHandlerTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_consume_off(self):
@@ -166,7 +165,7 @@ class PlaybackOptionsHandlerTest(unittest.TestCase):
 
 class PlaybackControlHandlerTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_next(self):

tests/frontends/mpd/reflection_test.py

@@ -2,11 +2,10 @@ import unittest
 
 from mopidy.backends.dummy import DummyBackend
 from mopidy.frontends.mpd import dispatcher
-from mopidy.mixers.dummy import DummyMixer
 
 class ReflectionHandlerTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_commands_returns_list_of_all_commands(self):

tests/frontends/mpd/regression_test.py

@@ -3,7 +3,6 @@ import unittest
 
 from mopidy.backends.dummy import DummyBackend
 from mopidy.frontends.mpd import dispatcher
-from mopidy.mixers.dummy import DummyMixer
 from mopidy.models import Track
 
 class IssueGH17RegressionTest(unittest.TestCase):
@@ -18,7 +17,7 @@ class IssueGH17RegressionTest(unittest.TestCase):
     """
 
     def setUp(self):
-        self.backend = DummyBackend(mixer_class=DummyMixer)
+        self.backend = DummyBackend()
         self.backend.current_playlist.append([
             Track(uri='a'), Track(uri='b'), None,
             Track(uri='d'), Track(uri='e'), Track(uri='f')])
@@ -52,7 +51,7 @@ class IssueGH18RegressionTest(unittest.TestCase):
     """
 
     def setUp(self):
-        self.backend = DummyBackend(mixer_class=DummyMixer)
+        self.backend = DummyBackend()
         self.backend.current_playlist.append([
             Track(uri='a'), Track(uri='b'), Track(uri='c'),
             Track(uri='d'), Track(uri='e'), Track(uri='f')])
@@ -91,7 +90,7 @@ class IssueGH22RegressionTest(unittest.TestCase):
     """
 
     def setUp(self):
-        self.backend = DummyBackend(mixer_class=DummyMixer)
+        self.backend = DummyBackend()
         self.backend.current_playlist.append([
             Track(uri='a'), Track(uri='b'), Track(uri='c'),
             Track(uri='d'), Track(uri='e'), Track(uri='f')])

tests/frontends/mpd/status_test.py

@@ -2,12 +2,11 @@ import unittest
 
 from mopidy.backends.dummy import DummyBackend
 from mopidy.frontends.mpd import dispatcher
-from mopidy.mixers.dummy import DummyMixer
 from mopidy.models import Track
 
 class StatusHandlerTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_clearerror(self):

tests/frontends/mpd/stickers_test.py

@@ -2,11 +2,10 @@ import unittest
 
 from mopidy.backends.dummy import DummyBackend
 from mopidy.frontends.mpd import dispatcher
-from mopidy.mixers.dummy import DummyMixer
 
 class StickersHandlerTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_sticker_get(self):

tests/frontends/mpd/stored_playlists_test.py

@@ -3,12 +3,11 @@ import unittest
 
 from mopidy.backends.dummy import DummyBackend
 from mopidy.frontends.mpd import dispatcher
-from mopidy.mixers.dummy import DummyMixer
 from mopidy.models import Track, Playlist
 
 class StoredPlaylistsHandlerTest(unittest.TestCase):
     def setUp(self):
-        self.b = DummyBackend(mixer_class=DummyMixer)
+        self.b = DummyBackend()
         self.h = dispatcher.MpdDispatcher(backend=self.b)
 
     def test_listplaylist(self):