From 1048795f2bd34abbe3c99984a4fe98c04f075ee7 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 20 Mar 2011 00:14:59 +0100 Subject: [PATCH] Update working MPD tests to start mixer actor --- tests/frontends/mpd/audio_output_test.py | 3 +++ tests/frontends/mpd/connection_test.py | 5 ++++- tests/frontends/mpd/current_playlist_test.py | 3 +++ tests/frontends/mpd/dispatcher_test.py | 3 +++ tests/frontends/mpd/music_db_test.py | 9 +++++++++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/tests/frontends/mpd/audio_output_test.py b/tests/frontends/mpd/audio_output_test.py index d4ddbc92..afa99d26 100644 --- a/tests/frontends/mpd/audio_output_test.py +++ b/tests/frontends/mpd/audio_output_test.py @@ -2,14 +2,17 @@ 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.start().proxy() + self.mixer = DummyMixer.start().proxy() self.h = dispatcher.MpdDispatcher() def tearDown(self): self.b.stop().get() + self.mixer.stop().get() def test_enableoutput(self): result = self.h.handle_request(u'enableoutput "0"') diff --git a/tests/frontends/mpd/connection_test.py b/tests/frontends/mpd/connection_test.py index 4d2a309d..cf161a5a 100644 --- a/tests/frontends/mpd/connection_test.py +++ b/tests/frontends/mpd/connection_test.py @@ -3,14 +3,17 @@ import unittest from mopidy import settings 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.start().proxy() + self.mixer = DummyMixer.start().proxy() self.h = dispatcher.MpdDispatcher() def tearDown(self): - self.b.stop() + self.b.stop().get() + self.mixer.stop().get() settings.runtime.clear() def test_close(self): diff --git a/tests/frontends/mpd/current_playlist_test.py b/tests/frontends/mpd/current_playlist_test.py index 8e189dee..eb113ed7 100644 --- a/tests/frontends/mpd/current_playlist_test.py +++ b/tests/frontends/mpd/current_playlist_test.py @@ -2,15 +2,18 @@ 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.start().proxy() + self.mixer = DummyMixer.start().proxy() self.h = dispatcher.MpdDispatcher() def tearDown(self): self.b.stop().get() + self.mixer.stop().get() def test_add(self): needle = Track(uri='dummy://foo') diff --git a/tests/frontends/mpd/dispatcher_test.py b/tests/frontends/mpd/dispatcher_test.py index 8c17c9ee..77e0ddf0 100644 --- a/tests/frontends/mpd/dispatcher_test.py +++ b/tests/frontends/mpd/dispatcher_test.py @@ -4,14 +4,17 @@ 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.start().proxy() + self.mixer = DummyMixer.start().proxy() self.h = dispatcher.MpdDispatcher() def tearDown(self): self.b.stop().get() + self.mixer.stop().get() def test_register_same_pattern_twice_fails(self): func = lambda: None diff --git a/tests/frontends/mpd/music_db_test.py b/tests/frontends/mpd/music_db_test.py index 595ef02c..fa5634be 100644 --- a/tests/frontends/mpd/music_db_test.py +++ b/tests/frontends/mpd/music_db_test.py @@ -2,14 +2,17 @@ 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.start().proxy() + self.mixer = DummyMixer.start().proxy() self.h = dispatcher.MpdDispatcher() def tearDown(self): self.b.stop().get() + self.mixer.stop().get() def test_count(self): result = self.h.handle_request(u'count "tag" "needle"') @@ -68,10 +71,12 @@ class MusicDatabaseHandlerTest(unittest.TestCase): class MusicDatabaseFindTest(unittest.TestCase): def setUp(self): self.b = DummyBackend.start().proxy() + self.mixer = DummyMixer.start().proxy() self.h = dispatcher.MpdDispatcher() def tearDown(self): self.b.stop().get() + self.mixer.stop().get() def test_find_album(self): result = self.h.handle_request(u'find "album" "what"') @@ -123,10 +128,12 @@ class MusicDatabaseFindTest(unittest.TestCase): class MusicDatabaseListTest(unittest.TestCase): def setUp(self): self.b = DummyBackend.start().proxy() + self.mixer = DummyMixer.start().proxy() self.h = dispatcher.MpdDispatcher() def tearDown(self): self.b.stop().get() + self.mixer.stop().get() def test_list_foo_returns_ack(self): result = self.h.handle_request(u'list "foo"') @@ -317,10 +324,12 @@ class MusicDatabaseListTest(unittest.TestCase): class MusicDatabaseSearchTest(unittest.TestCase): def setUp(self): self.b = DummyBackend.start().proxy() + self.mixer = DummyMixer.start().proxy() self.h = dispatcher.MpdDispatcher() def tearDown(self): self.b.stop().get() + self.mixer.stop().get() def test_search_album(self): result = self.h.handle_request(u'search "album" "analbum"')