From 1ea0978af5faa66e0acde949e1c953aa121412cb Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 18 Jan 2014 01:38:01 +0100 Subject: [PATCH] dummy: Move dummy backend back into the mopidy package --- docs/changelog.rst | 5 +++++ mopidy/{backend.py => backend/__init__.py} | 0 tests/dummy_backend.py => mopidy/backend/dummy.py | 0 tests/core/test_events.py | 5 ++--- tests/mpd/protocol/__init__.py | 5 ++--- tests/mpd/test_dispatcher.py | 5 ++--- tests/mpd/test_status.py | 5 ++--- tests/utils/test_jsonrpc.py | 5 ++--- 8 files changed, 15 insertions(+), 15 deletions(-) rename mopidy/{backend.py => backend/__init__.py} (100%) rename tests/dummy_backend.py => mopidy/backend/dummy.py (100%) diff --git a/docs/changelog.rst b/docs/changelog.rst index bbdebb80..61234f6d 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -68,6 +68,11 @@ guys. Thanks to everyone that has contributed! by backends that wants to expose directories of tracks in Mopidy's virtual file system. +**Frontend API** + +- The dummy backend used for testing many frontends have moved from + :mod:`mopidy.backends.dummy` to :mod:`mopidy.backend.dummy`. + **Commands** - Reduce amount of logging from dependencies when using :option:`mopidy -v`. diff --git a/mopidy/backend.py b/mopidy/backend/__init__.py similarity index 100% rename from mopidy/backend.py rename to mopidy/backend/__init__.py diff --git a/tests/dummy_backend.py b/mopidy/backend/dummy.py similarity index 100% rename from tests/dummy_backend.py rename to mopidy/backend/dummy.py diff --git a/tests/core/test_events.py b/tests/core/test_events.py index d975ae29..ffa84e6e 100644 --- a/tests/core/test_events.py +++ b/tests/core/test_events.py @@ -6,15 +6,14 @@ import unittest 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): - self.backend = dummy_backend.create_dummy_backend_proxy() + self.backend = dummy.create_dummy_backend_proxy() self.core = core.Core.start(backends=[self.backend]).proxy() def tearDown(self): diff --git a/tests/mpd/protocol/__init__.py b/tests/mpd/protocol/__init__.py index 216afe33..97b73b7a 100644 --- a/tests/mpd/protocol/__init__.py +++ b/tests/mpd/protocol/__init__.py @@ -6,10 +6,9 @@ import unittest import pykka from mopidy import core +from mopidy.backend import dummy from mopidy.mpd import session -from tests import dummy_backend - class MockConnection(mock.Mock): def __init__(self, *args, **kwargs): @@ -32,7 +31,7 @@ class BaseTestCase(unittest.TestCase): } def setUp(self): - self.backend = dummy_backend.create_dummy_backend_proxy() + self.backend = dummy.create_dummy_backend_proxy() self.core = core.Core.start(backends=[self.backend]).proxy() self.connection = MockConnection() diff --git a/tests/mpd/test_dispatcher.py b/tests/mpd/test_dispatcher.py index 36f2f5e1..c4da1714 100644 --- a/tests/mpd/test_dispatcher.py +++ b/tests/mpd/test_dispatcher.py @@ -5,12 +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 mopidy.mpd.protocol import request_handlers, handle_request -from tests import dummy_backend - class MpdDispatcherTest(unittest.TestCase): def setUp(self): @@ -19,7 +18,7 @@ class MpdDispatcherTest(unittest.TestCase): 'password': None, } } - self.backend = dummy_backend.create_dummy_backend_proxy() + self.backend = dummy.create_dummy_backend_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 5c22be36..cd910340 100644 --- a/tests/mpd/test_status.py +++ b/tests/mpd/test_status.py @@ -5,13 +5,12 @@ import unittest import pykka from mopidy import core +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 +21,7 @@ STOPPED = PlaybackState.STOPPED class StatusHandlerTest(unittest.TestCase): def setUp(self): - self.backend = dummy_backend.create_dummy_backend_proxy() + self.backend = dummy.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/test_jsonrpc.py b/tests/utils/test_jsonrpc.py index f562f113..6bd6a32b 100644 --- a/tests/utils/test_jsonrpc.py +++ b/tests/utils/test_jsonrpc.py @@ -7,10 +7,9 @@ import unittest 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 model(self): @@ -41,7 +40,7 @@ class Calculator(object): class JsonRpcTestBase(unittest.TestCase): def setUp(self): - self.backend = dummy_backend.create_dummy_backend_proxy() + self.backend = dummy.create_dummy_backend_proxy() self.core = core.Core.start(backends=[self.backend]).proxy() self.jrw = jsonrpc.JsonRpcWrapper(