Merge branch 'master' into release-2.2
This commit is contained in:
commit
6a26c6b96f
@ -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
|
||||
|
||||
|
||||
@ -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(':')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user