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

Fix 400 or so tests broken by changing the mixer constructor

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-08-14 04:05:43 +02:00
parent 250168ebba
commit da2a44fd17
16 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mopidy/backends/base/__init__.py
View File

@ -25,18 +25,18 @@ class BaseBackend(object):
:type core_queue: :class:`multiprocessing.Queue`
:param output_queue: a queue for sending messages to the output process
:type output_queue: :class:`multiprocessing.Queue`
:param mixer: either a mixer instance, or :class:`None` to use the mixer
:param mixer_class: either a mixer class, or :class:`None` to use the mixer
defined in settings
:type mixer: :class:`mopidy.mixers.BaseMixer` or :class:`None`
:type mixer_class: a subclass of :class:`mopidy.mixers.BaseMixer` or
:class:`None`
"""
def __init__(self, core_queue=None, output_queue=None, mixer=None):
def __init__(self, core_queue=None, output_queue=None, mixer_class=None):
self.core_queue = core_queue
self.output_queue = output_queue
if mixer is not None:
self.mixer = mixer
else:
self.mixer = get_class(settings.MIXER)(self)
if mixer_class is None:
mixer_class = get_class(settings.MIXER)
self.mixer = mixer_class(self)
#: A :class:`multiprocessing.Queue` which can be used by e.g. library
#: callbacks executing in other threads to send messages to the core

8
tests/backends/base.py
View File

@ -32,7 +32,7 @@ class BaseCurrentPlaylistControllerTest(object):
backend_class = None
def setUp(self):
self.backend = self.backend_class(mixer=DummyMixer())
self.backend = self.backend_class(mixer_class=DummyMixer)
self.controller = self.backend.current_playlist
self.playback = self.backend.playback
@ -281,7 +281,7 @@ class BasePlaybackControllerTest(object):
backend_class = None
def setUp(self):
self.backend = self.backend_class(mixer=DummyMixer())
self.backend = self.backend_class(mixer_class=DummyMixer)
self.playback = self.backend.playback
self.current_playlist = self.backend.current_playlist
@ -933,7 +933,7 @@ class BaseStoredPlaylistsControllerTest(object):
settings.LOCAL_TAG_CACHE = data_folder('library_tag_cache')
settings.LOCAL_MUSIC_FOLDER = data_folder('')
self.backend = self.backend_class(mixer=DummyMixer())
self.backend = self.backend_class(mixer_class=DummyMixer)
self.stored = self.backend.stored_playlists
def tearDown(self):
@ -1055,7 +1055,7 @@ class BaseLibraryControllerTest(object):
Track()]
def setUp(self):
self.backend = self.backend_class(mixer=DummyMixer())
self.backend = self.backend_class(mixer_class=DummyMixer)
self.library = self.backend.library
def tearDown(self):

2
tests/backends/local_test.py
View File

@ -116,7 +116,7 @@ class LocalStoredPlaylistsControllerTest(BaseStoredPlaylistsControllerTest,
self.stored.save(playlist)
self.backend.destroy()
self.backend = self.backend_class(mixer=DummyMixer())
self.backend = self.backend_class(mixer_class=DummyMixer)
self.stored = self.backend.stored_playlists
self.assert_(self.stored.playlists)

3
tests/frontends/mpd/audio_output_test.py
View File

@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer
class AudioOutputHandlerTest(unittest.TestCase):
def setUp(self):
self.m = DummyMixer()
self.b = DummyBackend(mixer=self.m)
self.b = DummyBackend(mixer_class=DummyMixer)
self.h = frontend.MpdFrontend(backend=self.b)
def test_enableoutput(self):

3
tests/frontends/mpd/command_list_test.py
View File

@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer
class CommandListsTest(unittest.TestCase):
def setUp(self):
self.m = DummyMixer()
self.b = DummyBackend(mixer=self.m)
self.b = DummyBackend(mixer_class=DummyMixer)
self.h = frontend.MpdFrontend(backend=self.b)
def test_command_list_begin(self):

3
tests/frontends/mpd/connection_test.py
View File

@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer
class ConnectionHandlerTest(unittest.TestCase):
def setUp(self):
self.m = DummyMixer()
self.b = DummyBackend(mixer=self.m)
self.b = DummyBackend(mixer_class=DummyMixer)
self.h = frontend.MpdFrontend(backend=self.b)
def test_close(self):

3
tests/frontends/mpd/current_playlist_test.py
View File

@ -7,8 +7,7 @@ from mopidy.models import Track
class CurrentPlaylistHandlerTest(unittest.TestCase):
def setUp(self):
self.m = DummyMixer()
self.b = DummyBackend(mixer=self.m)
self.b = DummyBackend(mixer_class=DummyMixer)
self.h = frontend.MpdFrontend(backend=self.b)
def test_add(self):

3
tests/frontends/mpd/music_db_test.py
View File

@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer
class MusicDatabaseHandlerTest(unittest.TestCase):
def setUp(self):
self.m = DummyMixer()
self.b = DummyBackend(mixer=self.m)
self.b = DummyBackend(mixer_class=DummyMixer)
self.h = frontend.MpdFrontend(backend=self.b)
def test_count(self):

6
tests/frontends/mpd/playback_test.py
View File

@ -7,8 +7,7 @@ from mopidy.models import Track
class PlaybackOptionsHandlerTest(unittest.TestCase):
def setUp(self):
self.m = DummyMixer()
self.b = DummyBackend(mixer=self.m)
self.b = DummyBackend(mixer_class=DummyMixer)
self.h = frontend.MpdFrontend(backend=self.b)
def test_consume_off(self):
@ -167,8 +166,7 @@ class PlaybackOptionsHandlerTest(unittest.TestCase):
class PlaybackControlHandlerTest(unittest.TestCase):
def setUp(self):
self.m = DummyMixer()
self.b = DummyBackend(mixer=self.m)
self.b = DummyBackend(mixer_class=DummyMixer)
self.h = frontend.MpdFrontend(backend=self.b)
def test_next(self):

3
tests/frontends/mpd/reflection_test.py
View File

@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer
class ReflectionHandlerTest(unittest.TestCase):
def setUp(self):
self.m = DummyMixer()
self.b = DummyBackend(mixer=self.m)
self.b = DummyBackend(mixer_class=DummyMixer)
self.h = frontend.MpdFrontend(backend=self.b)
def test_commands_returns_list_of_all_commands(self):

3
tests/frontends/mpd/request_handler_test.py
View File

@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer
class RequestHandlerTest(unittest.TestCase):
def setUp(self):
self.m = DummyMixer()
self.b = DummyBackend(mixer=self.m)
self.b = DummyBackend(mixer_class=DummyMixer)
self.h = frontend.MpdFrontend(backend=self.b)
def test_register_same_pattern_twice_fails(self):

3
tests/frontends/mpd/status_test.py
View File

@ -7,8 +7,7 @@ from mopidy.models import Track
class StatusHandlerTest(unittest.TestCase):
def setUp(self):
self.m = DummyMixer()
self.b = DummyBackend(mixer=self.m)
self.b = DummyBackend(mixer_class=DummyMixer)
self.h = frontend.MpdFrontend(backend=self.b)
def test_clearerror(self):

3
tests/frontends/mpd/stickers_test.py
View File

@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer
class StickersHandlerTest(unittest.TestCase):
def setUp(self):
self.m = DummyMixer()
self.b = DummyBackend(mixer=self.m)
self.b = DummyBackend(mixer_class=DummyMixer)
self.h = frontend.MpdFrontend(backend=self.b)
def test_sticker_get(self):

3
tests/frontends/mpd/stored_playlists_test.py
View File

@ -10,8 +10,7 @@ from tests import SkipTest
class StoredPlaylistsHandlerTest(unittest.TestCase):
def setUp(self):
self.m = DummyMixer()
self.b = DummyBackend(mixer=self.m)
self.b = DummyBackend(mixer_class=DummyMixer)
self.h = frontend.MpdFrontend(backend=self.b)
def test_listplaylist(self):

2
tests/mixers/base_test.py
View File

@ -12,7 +12,7 @@ class BaseMixerTest(unittest.TestCase):
INITIAL = None
def setUp(self):
self.mixer = DummyMixer()
self.mixer = DummyMixer(None)
def test_initial_volume(self):
self.assertEqual(self.mixer.volume, self.INITIAL)

2
tests/mixers/denon_test.py
View File

@ -29,7 +29,7 @@ class DenonMixerTest(BaseMixerTest):
def setUp(self):
self.device = DenonMixerDeviceMock()
self.mixer = DenonMixer(device=self.device)
self.mixer = DenonMixer(None, device=self.device)
def test_reopen_device(self):
self.device._open = False