diff --git a/tests/backends/base/current_playlist.py b/tests/backends/base/current_playlist.py index 1b312c2f..59c7b39f 100644 --- a/tests/backends/base/current_playlist.py +++ b/tests/backends/base/current_playlist.py @@ -4,6 +4,7 @@ import random from mopidy import settings from mopidy.mixers.dummy import DummyMixer from mopidy.models import Playlist, Track +from mopidy.outputs.dummy import DummyOutput from mopidy.utils import get_class from tests.backends.base import populate_playlist @@ -12,12 +13,10 @@ class BaseCurrentPlaylistControllerTest(object): tracks = [] def setUp(self): - self.output_queue = multiprocessing.Queue() self.core_queue = multiprocessing.Queue() - self.output = get_class(settings.OUTPUT)( - self.core_queue, self.output_queue) + self.output = DummyOutput(self.core_queue) self.backend = self.backend_class( - self.core_queue, self.output_queue, DummyMixer) + self.core_queue, self.output, DummyMixer) self.controller = self.backend.current_playlist self.playback = self.backend.playback diff --git a/tests/backends/base/playback.py b/tests/backends/base/playback.py index 04b5ed7b..afbfea6c 100644 --- a/tests/backends/base/playback.py +++ b/tests/backends/base/playback.py @@ -5,6 +5,7 @@ import time from mopidy import settings from mopidy.mixers.dummy import DummyMixer from mopidy.models import Track +from mopidy.outputs.dummy import DummyOutput from mopidy.utils import get_class from tests import SkipTest @@ -16,12 +17,10 @@ class BasePlaybackControllerTest(object): tracks = [] def setUp(self): - self.output_queue = multiprocessing.Queue() self.core_queue = multiprocessing.Queue() - self.output = get_class(settings.OUTPUT)( - self.core_queue, self.output_queue) + self.output = DummyOutput(self.core_queue) self.backend = self.backend_class( - self.core_queue, self.output_queue, DummyMixer) + self.core_queue, self.output, DummyMixer) self.playback = self.backend.playback self.current_playlist = self.backend.current_playlist diff --git a/tests/outputs/gstreamer_test.py b/tests/outputs/gstreamer_test.py index b380197d..2094c038 100644 --- a/tests/outputs/gstreamer_test.py +++ b/tests/outputs/gstreamer_test.py @@ -20,9 +20,9 @@ class GStreamerOutputTest(unittest.TestCase): self.original_backends = settings.BACKENDS settings.BACKENDS = ('mopidy.backends.local.LocalBackend',) self.song_uri = path_to_uri(data_folder('song1.wav')) - self.output_queue = multiprocessing.Queue() self.core_queue = multiprocessing.Queue() - self.output = GStreamerOutput(self.core_queue, self.output_queue) + self.output = GStreamerOutput(self.core_queue) + self.output.start() def tearDown(self): self.output.destroy() @@ -30,14 +30,16 @@ class GStreamerOutputTest(unittest.TestCase): def send_recv(self, message): (my_end, other_end) = multiprocessing.Pipe() - message.update({'reply_to': pickle_connection(other_end)}) - self.output_queue.put(message) + message.update({ + 'to': 'output', + 'reply_to': pickle_connection(other_end), + }) + self.output.process_message(message) my_end.poll(None) return my_end.recv() - def send(self, message): - self.output_queue.put(message) + self.output.process_message(message) def test_play_uri_existing_file(self): message = {'command': 'play_uri', 'uri': self.song_uri}