diff --git a/mopidy/frontends/mpris.py b/mopidy/frontends/mpris.py index 6f6b09a5..8ec8c0a7 100644 --- a/mopidy/frontends/mpris.py +++ b/mopidy/frontends/mpris.py @@ -16,6 +16,7 @@ from mopidy.backends.base import Backend from mopidy.backends.base.playback import PlaybackController from mopidy.frontends.base import BaseFrontend from mopidy.mixers.base import BaseMixer +from mopidy.utils.process import exit_process logger = logging.getLogger('mopidy.frontends.mpris') @@ -230,7 +231,7 @@ class MprisObject(dbus.service.Object): @dbus.service.method(dbus_interface=ROOT_IFACE) def Quit(self): logger.debug(u'%s.Quit called', ROOT_IFACE) - ActorRegistry.stop_all() + exit_process() ### Player interface methods diff --git a/tests/frontends/mpris/root_interface_test.py b/tests/frontends/mpris/root_interface_test.py index f088d4dd..622f3414 100644 --- a/tests/frontends/mpris/root_interface_test.py +++ b/tests/frontends/mpris/root_interface_test.py @@ -1,13 +1,11 @@ import mock import unittest -from pykka.registry import ActorRegistry - from mopidy.frontends import mpris class RootInterfaceTest(unittest.TestCase): def setUp(self): - mpris.ActorRegistry = mock.Mock(spec=ActorRegistry) + mpris.exit_process = mock.Mock() mpris.MprisObject._connect_to_dbus = mock.Mock() self.mpris = mpris.MprisObject() @@ -27,7 +25,7 @@ class RootInterfaceTest(unittest.TestCase): def test_quit_should_stop_all_actors(self): self.mpris.Quit() - self.assert_(mpris.ActorRegistry.stop_all.called) + self.assert_(mpris.exit_process.called) def test_has_track_list_returns_false(self): result = self.mpris.Get(mpris.ROOT_IFACE, 'HasTrackList')