Merge branch 'master' into release-2.2

mopidy · Jun 9, 2019 · 6a26c6b · 6a26c6b
2 parents 3ab6b55 + dbd8051
commit 6a26c6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/internal/network/test_server.py b/tests/internal/network/test_server.py
@@ -236,7 +236,7 @@ def test_maximum_connections_exceeded(self):
         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
 

diff --git a/tests/mpd/test_status.py b/tests/mpd/test_status.py
@@ -193,7 +193,7 @@ def test_status_method_when_playing_contains_time_with_no_length(self):
 
     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(':')