Skip to content

Commit

Permalink
dummy: Move dummy backend back into the mopidy package
Browse files Browse the repository at this point in the history
  • Loading branch information
jodal committed Jan 18, 2014
1 parent e97e620 commit 1ea0978
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
5 changes: 5 additions & 0 deletions docs/changelog.rst
Expand Up @@ -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`.
Expand Down
File renamed without changes.
File renamed without changes.
5 changes: 2 additions & 3 deletions tests/core/test_events.py
Expand Up @@ -6,15 +6,14 @@
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):
Expand Down
5 changes: 2 additions & 3 deletions tests/mpd/protocol/__init__.py
Expand Up @@ -6,10 +6,9 @@
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):
Expand All @@ -32,7 +31,7 @@ def get_config(self):
}

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()
Expand Down
5 changes: 2 additions & 3 deletions tests/mpd/test_dispatcher.py
Expand Up @@ -5,12 +5,11 @@
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):
Expand All @@ -19,7 +18,7 @@ def setUp(self):
'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)

Expand Down
5 changes: 2 additions & 3 deletions tests/mpd/test_status.py
Expand Up @@ -5,13 +5,12 @@
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
Expand All @@ -22,7 +21,7 @@

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
Expand Down
5 changes: 2 additions & 3 deletions tests/utils/test_jsonrpc.py
Expand Up @@ -7,10 +7,9 @@
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):
Expand Down Expand Up @@ -41,7 +40,7 @@ def fail(self):

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(
Expand Down

0 comments on commit 1ea0978

Please sign in to comment.