From 8950385815210cbd89182eeda68f26a7ddd82cb0 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sat, 14 Aug 2010 17:27:26 +0200 Subject: [PATCH] Update local backend tests to setup output and queues --- tests/backends/base.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/backends/base.py b/tests/backends/base.py index 64ca7797..d0389c0d 100644 --- a/tests/backends/base.py +++ b/tests/backends/base.py @@ -4,10 +4,12 @@ import shutil import tempfile import threading import time +import multiprocessing from mopidy import settings from mopidy.mixers.dummy import DummyMixer from mopidy.models import Playlist, Track, Album, Artist +from mopidy.utils import get_class from tests import SkipTest, data_folder @@ -32,7 +34,10 @@ class BaseCurrentPlaylistControllerTest(object): backend_class = None def setUp(self): - self.backend = self.backend_class(mixer_class=DummyMixer) + self.output_queue = multiprocessing.Queue() + self.core_queue = multiprocessing.Queue() + self.output = get_class(settings.OUTPUT)(self.core_queue, self.output_queue) + self.backend = self.backend_class(self.core_queue, self.output_queue, DummyMixer) self.controller = self.backend.current_playlist self.playback = self.backend.playback @@ -40,6 +45,7 @@ class BaseCurrentPlaylistControllerTest(object): def tearDown(self): self.backend.destroy() + self.output.destroy() def test_add(self): for track in self.tracks: @@ -281,7 +287,10 @@ class BasePlaybackControllerTest(object): backend_class = None def setUp(self): - self.backend = self.backend_class(mixer_class=DummyMixer) + self.output_queue = multiprocessing.Queue() + self.core_queue = multiprocessing.Queue() + self.output = get_class(settings.OUTPUT)(self.core_queue, self.output_queue) + self.backend = self.backend_class(self.core_queue, self.output_queue, DummyMixer) self.playback = self.backend.playback self.current_playlist = self.backend.current_playlist @@ -292,6 +301,7 @@ class BasePlaybackControllerTest(object): def tearDown(self): self.backend.destroy() + self.output.destroy() def test_initial_state_is_stopped(self): self.assertEqual(self.playback.state, self.playback.STOPPED)