diff --git a/tests/core/test_events.py b/tests/core/test_events.py index 7226673d..942f9b5f 100644 --- a/tests/core/test_events.py +++ b/tests/core/test_events.py @@ -7,14 +7,15 @@ import mock import pykka from mopidy import core -from mopidy.backend import dummy from mopidy.models import Track +from tests import dummy_backend + @mock.patch.object(core.CoreListener, 'send') class BackendEventsTest(unittest.TestCase): def setUp(self): # noqa: N802 - self.backend = dummy.create_dummy_backend_proxy() + self.backend = dummy_backend.create_proxy() self.core = core.Core.start(backends=[self.backend]).proxy() def tearDown(self): # noqa: N802 diff --git a/mopidy/backend/dummy.py b/tests/dummy_backend.py similarity index 98% rename from mopidy/backend/dummy.py rename to tests/dummy_backend.py index dfddf5ae..05b0fbff 100644 --- a/mopidy/backend/dummy.py +++ b/tests/dummy_backend.py @@ -12,7 +12,7 @@ from mopidy import backend from mopidy.models import Playlist, Ref, SearchResult -def create_dummy_backend_proxy(config=None, audio=None): +def create_proxy(config=None, audio=None): return DummyBackend.start(config=config, audio=audio).proxy() diff --git a/tests/mpd/protocol/__init__.py b/tests/mpd/protocol/__init__.py index ba446cb0..ed4920f2 100644 --- a/tests/mpd/protocol/__init__.py +++ b/tests/mpd/protocol/__init__.py @@ -7,9 +7,10 @@ import mock import pykka from mopidy import core, mixer -from mopidy.backend import dummy from mopidy.mpd import session, uri_mapper +from tests import dummy_backend + class MockConnection(mock.Mock): def __init__(self, *args, **kwargs): @@ -33,7 +34,7 @@ class BaseTestCase(unittest.TestCase): def setUp(self): # noqa: N802 self.mixer = mixer.DummyMixer.start().proxy() - self.backend = dummy.create_dummy_backend_proxy() + self.backend = dummy_backend.create_proxy() self.core = core.Core.start( mixer=self.mixer, backends=[self.backend]).proxy() diff --git a/tests/mpd/test_dispatcher.py b/tests/mpd/test_dispatcher.py index 1a230451..63981668 100644 --- a/tests/mpd/test_dispatcher.py +++ b/tests/mpd/test_dispatcher.py @@ -5,10 +5,11 @@ import unittest import pykka from mopidy import core -from mopidy.backend import dummy from mopidy.mpd.dispatcher import MpdDispatcher from mopidy.mpd.exceptions import MpdAckError +from tests import dummy_backend + class MpdDispatcherTest(unittest.TestCase): def setUp(self): # noqa: N802 @@ -17,7 +18,7 @@ class MpdDispatcherTest(unittest.TestCase): 'password': None, } } - self.backend = dummy.create_dummy_backend_proxy() + self.backend = dummy_backend.create_proxy() self.core = core.Core.start(backends=[self.backend]).proxy() self.dispatcher = MpdDispatcher(config=config) diff --git a/tests/mpd/test_status.py b/tests/mpd/test_status.py index 8dbfb1e4..069addca 100644 --- a/tests/mpd/test_status.py +++ b/tests/mpd/test_status.py @@ -5,12 +5,14 @@ import unittest import pykka from mopidy import core, mixer -from mopidy.backend import dummy from mopidy.core import PlaybackState from mopidy.models import Track from mopidy.mpd import dispatcher from mopidy.mpd.protocol import status +from tests import dummy_backend + + PAUSED = PlaybackState.PAUSED PLAYING = PlaybackState.PLAYING STOPPED = PlaybackState.STOPPED @@ -22,7 +24,7 @@ STOPPED = PlaybackState.STOPPED class StatusHandlerTest(unittest.TestCase): def setUp(self): # noqa: N802 self.mixer = mixer.DummyMixer.start().proxy() - self.backend = dummy.create_dummy_backend_proxy() + self.backend = dummy_backend.create_proxy() self.core = core.Core.start( mixer=self.mixer, backends=[self.backend]).proxy() self.dispatcher = dispatcher.MpdDispatcher(core=self.core) diff --git a/tests/utils/test_jsonrpc.py b/tests/utils/test_jsonrpc.py index 535df175..4471a4a0 100644 --- a/tests/utils/test_jsonrpc.py +++ b/tests/utils/test_jsonrpc.py @@ -8,9 +8,10 @@ import mock import pykka from mopidy import core, models -from mopidy.backend import dummy from mopidy.utils import jsonrpc +from tests import dummy_backend + class Calculator(object): def __init__(self): @@ -50,7 +51,7 @@ class Calculator(object): class JsonRpcTestBase(unittest.TestCase): def setUp(self): # noqa: N802 - self.backend = dummy.create_dummy_backend_proxy() + self.backend = dummy_backend.create_proxy() self.core = core.Core.start(backends=[self.backend]).proxy() self.calc = Calculator()