diff --git a/tests/core/events_test.py b/tests/core/events_test.py index 5d646840..17d2eb84 100644 --- a/tests/core/events_test.py +++ b/tests/core/events_test.py @@ -6,14 +6,15 @@ import unittest import pykka from mopidy import core -from mopidy.backends 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): - self.backend = dummy.create_dummy_backend_proxy() + self.backend = dummy_backend.create_dummy_backend_proxy() self.core = core.Core.start(backends=[self.backend]).proxy() def tearDown(self): diff --git a/mopidy/backends/dummy.py b/tests/dummy_backend.py similarity index 96% rename from mopidy/backends/dummy.py rename to tests/dummy_backend.py index b3be0889..9fdedaa6 100644 --- a/mopidy/backends/dummy.py +++ b/tests/dummy_backend.py @@ -2,16 +2,6 @@ This backend implements the backend API in the simplest way possible. It is used in tests of the frontends. - -The backend handles URIs starting with ``dummy:``. - -**Dependencies** - -None - -**Default config** - -None """ from __future__ import unicode_literals diff --git a/tests/mpd/dispatcher_test.py b/tests/mpd/dispatcher_test.py index 13f2d7a5..36f2f5e1 100644 --- a/tests/mpd/dispatcher_test.py +++ b/tests/mpd/dispatcher_test.py @@ -5,11 +5,12 @@ import unittest import pykka from mopidy import core -from mopidy.backends import dummy from mopidy.mpd.dispatcher import MpdDispatcher from mopidy.mpd.exceptions import MpdAckError from mopidy.mpd.protocol import request_handlers, handle_request +from tests import dummy_backend + class MpdDispatcherTest(unittest.TestCase): def setUp(self): @@ -18,7 +19,7 @@ class MpdDispatcherTest(unittest.TestCase): 'password': None, } } - self.backend = dummy.create_dummy_backend_proxy() + self.backend = dummy_backend.create_dummy_backend_proxy() self.core = core.Core.start(backends=[self.backend]).proxy() self.dispatcher = MpdDispatcher(config=config) diff --git a/tests/mpd/protocol/__init__.py b/tests/mpd/protocol/__init__.py index 9f3b58d6..216afe33 100644 --- a/tests/mpd/protocol/__init__.py +++ b/tests/mpd/protocol/__init__.py @@ -6,9 +6,10 @@ import unittest import pykka from mopidy import core -from mopidy.backends import dummy from mopidy.mpd import session +from tests import dummy_backend + class MockConnection(mock.Mock): def __init__(self, *args, **kwargs): @@ -31,7 +32,7 @@ class BaseTestCase(unittest.TestCase): } def setUp(self): - self.backend = dummy.create_dummy_backend_proxy() + self.backend = dummy_backend.create_dummy_backend_proxy() self.core = core.Core.start(backends=[self.backend]).proxy() self.connection = MockConnection() diff --git a/tests/mpd/status_test.py b/tests/mpd/status_test.py index dea0c479..5c22be36 100644 --- a/tests/mpd/status_test.py +++ b/tests/mpd/status_test.py @@ -5,12 +5,12 @@ import unittest import pykka from mopidy import core -from mopidy.backends import dummy from mopidy.core import PlaybackState +from mopidy.models import Track from mopidy.mpd import dispatcher from mopidy.mpd.protocol import status -from mopidy.models import Track +from tests import dummy_backend PAUSED = PlaybackState.PAUSED PLAYING = PlaybackState.PLAYING @@ -22,7 +22,7 @@ STOPPED = PlaybackState.STOPPED class StatusHandlerTest(unittest.TestCase): def setUp(self): - self.backend = dummy.create_dummy_backend_proxy() + self.backend = dummy_backend.create_dummy_backend_proxy() self.core = core.Core.start(backends=[self.backend]).proxy() self.dispatcher = dispatcher.MpdDispatcher(core=self.core) self.context = self.dispatcher.context diff --git a/tests/utils/jsonrpc_test.py b/tests/utils/jsonrpc_test.py index c6f516bb..f562f113 100644 --- a/tests/utils/jsonrpc_test.py +++ b/tests/utils/jsonrpc_test.py @@ -7,9 +7,10 @@ import unittest import pykka from mopidy import core, models -from mopidy.backends import dummy from mopidy.utils import jsonrpc +from tests import dummy_backend + class Calculator(object): def model(self): @@ -40,7 +41,7 @@ class Calculator(object): class JsonRpcTestBase(unittest.TestCase): def setUp(self): - self.backend = dummy.create_dummy_backend_proxy() + self.backend = dummy_backend.create_dummy_backend_proxy() self.core = core.Core.start(backends=[self.backend]).proxy() self.jrw = jsonrpc.JsonRpcWrapper(