diff --git a/tests/backends/base/events.py b/tests/backends/base/events.py index 2b6df347..1d31a721 100644 --- a/tests/backends/base/events.py +++ b/tests/backends/base/events.py @@ -10,7 +10,7 @@ from mopidy.backends import listener @mock.patch.object(listener.BackendListener, 'send') class BackendEventsTest(object): def setUp(self): - self.audio = mock.Mock(spec=audio.Audio) + self.audio = audio.DummyAudio.start().proxy() self.backend = self.backend_class.start(audio=self.audio).proxy() self.core = core.Core.start(backends=[self.backend]).proxy() diff --git a/tests/backends/base/playback.py b/tests/backends/base/playback.py index 155fa661..d7979018 100644 --- a/tests/backends/base/playback.py +++ b/tests/backends/base/playback.py @@ -4,6 +4,8 @@ import mock import random import time +import pykka + from mopidy import audio, core from mopidy.core import PlaybackState from mopidy.models import Track @@ -18,7 +20,7 @@ class PlaybackControllerTest(object): tracks = [] def setUp(self): - self.audio = mock.Mock(spec=audio.Audio) + self.audio = audio.DummyAudio.start().proxy() self.backend = self.backend_class.start(audio=self.audio).proxy() self.core = core.Core(backends=[self.backend]) self.playback = self.core.playback @@ -29,6 +31,9 @@ class PlaybackControllerTest(object): assert self.tracks[0].length >= 2000, \ 'First song needs to be at least 2000 miliseconds' + def tearDown(self): + pykka.ActorRegistry.stop_all() + def test_initial_state_is_stopped(self): self.assertEqual(self.playback.state, PlaybackState.STOPPED) diff --git a/tests/backends/base/playlists.py b/tests/backends/base/playlists.py index c162e500..2184168f 100644 --- a/tests/backends/base/playlists.py +++ b/tests/backends/base/playlists.py @@ -4,7 +4,6 @@ import os import shutil import tempfile -import mock import pykka from mopidy import audio, core, settings @@ -19,7 +18,7 @@ class PlaylistsControllerTest(object): settings.LOCAL_TAG_CACHE_FILE = path_to_data_dir('library_tag_cache') settings.LOCAL_MUSIC_PATH = path_to_data_dir('') - self.audio = mock.Mock(spec=audio.Audio) + self.audio = audio.DummyAudio.start().proxy() self.backend = self.backend_class.start(audio=self.audio).proxy() self.core = core.Core(backends=[self.backend]) diff --git a/tests/backends/base/tracklist.py b/tests/backends/base/tracklist.py index 39536edc..39fb020d 100644 --- a/tests/backends/base/tracklist.py +++ b/tests/backends/base/tracklist.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -import mock import random import pykka @@ -16,7 +15,7 @@ class TracklistControllerTest(object): tracks = [] def setUp(self): - self.audio = mock.Mock(spec=audio.Audio) + self.audio = audio.DummyAudio.start().proxy() self.backend = self.backend_class.start(audio=self.audio).proxy() self.core = core.Core(audio=self.audio, backends=[self.backend]) self.controller = self.core.tracklist