Use new exit_process() function in mpris.Quit()

This commit is contained in:
Stein Magnus Jodal 2011-06-20 19:14:34 +03:00
parent a2f90a7418
commit 182f074222
2 changed files with 4 additions and 5 deletions

View File

@ -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

View File

@ -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')