diff --git a/mopidy/handler.py b/mopidy/handler.py index ddcc8655..052e916d 100644 --- a/mopidy/handler.py +++ b/mopidy/handler.py @@ -354,7 +354,7 @@ class MpdHandler(object): @register(r'^update( "(?P[^"]+)")*$') def _update(self, uri=None, rescan_unmodified_files=False): - return u'updating_db: 0' # TODO + return {'updating_db': 0} # TODO @register(r'^urlhandlers$') def _urlhandlers(self): diff --git a/tests/handlertest.py b/tests/handlertest.py index 6589c120..4360dd2a 100644 --- a/tests/handlertest.py +++ b/tests/handlertest.py @@ -502,31 +502,23 @@ class MusicDatabaseHandlerTest(unittest.TestCase): def test_update_without_uri(self): result = self.h.handle_request(u'update') - (label, jobid) = result.split(':', 1) - self.assertEquals(u'updating_db', label) - self.assert_(jobid.strip().isdigit()) - self.assert_(int(jobid) >= 0) + self.assert_('updating_db' in result) + self.assert_(result['updating_db'] >= 0) def test_update_with_uri(self): result = self.h.handle_request(u'update "file:///dev/urandom"') - (label, jobid) = result.split(':', 1) - self.assertEquals(u'updating_db', label) - self.assert_(jobid.strip().isdigit()) - self.assert_(int(jobid) >= 0) + self.assert_('updating_db' in result) + self.assert_(result['updating_db'] >= 0) def test_rescan_without_uri(self): result = self.h.handle_request(u'rescan') - (label, jobid) = result.split(':', 1) - self.assertEquals(u'updating_db', label) - self.assert_(jobid.strip().isdigit()) - self.assert_(int(jobid) >= 0) + self.assert_('updating_db' in result) + self.assert_(result['updating_db'] >= 0) def test_rescan_with_uri(self): result = self.h.handle_request(u'rescan "file:///dev/urandom"') - (label, jobid) = result.split(':', 1) - self.assertEquals(u'updating_db', label) - self.assert_(jobid.strip().isdigit()) - self.assert_(int(jobid) >= 0) + self.assert_('updating_db' in result) + self.assert_(result['updating_db'] >= 0) class StickersHandlerTest(unittest.TestCase):