Merge branch 'master' into release-2.2

This commit is contained in:
Stein Magnus Jodal 2019-06-10 01:42:23 +02:00
commit 6a26c6b96f
2 changed files with 2 additions and 2 deletions

View File

@ -236,7 +236,7 @@ class ServerTest(unittest.TestCase):
self.assertFalse(
network.Server.maximum_connections_exceeded(self.mock))
@patch('pykka.registry.ActorRegistry.get_by_class')
@patch('pykka.ActorRegistry.get_by_class')
def test_number_of_connections(self, get_by_class):
self.mock.protocol = sentinel.protocol

View File

@ -193,7 +193,7 @@ class StatusHandlerTest(unittest.TestCase):
def test_status_method_when_playing_contains_time_with_length(self):
self.set_tracklist([Track(uri='dummy:/a', length=10000)])
self.core.playback.play()
self.core.playback.play().get()
result = dict(status.status(self.context))
self.assertIn('time', result)
(position, total) = result['time'].split(':')