Merge remote-tracking branch 'origin/fix/1378' into fix/1378

Conflicts: docs/changelog.rst tests/core/test_playback.py
mopidy · Jan 2, 2016 · 15a3d70 · 15a3d70
2 parents 56efd98 + ec43e21
commit 15a3d70
Showing 1 changed file with 37 additions and 37 deletions.
diff --git a/tests/core/test_playback.py b/tests/core/test_playback.py
@@ -845,43 +845,6 @@ def test(self):
         b.playback.change_track.assert_called_once_with(track2)
 
 
-class Bug1352RegressionTest(unittest.TestCase):
-    def test(self):
-        config = {
-            'core': {
-                'max_tracklist_length': 10000,
-            }
-        }
-
-        b = mock.Mock()
-        b.uri_schemes.get.return_value = ['dummy']
-        b.playback = mock.Mock(spec=backend.PlaybackProvider)
-        b.playback.change_track.return_value.get.return_value = True
-        b.playback.play.return_value.get.return_value = True
-
-        track1 = Track(uri='dummy:a', length=40000)
-        track2 = Track(uri='dummy:b', length=40000)
-
-        tl_track2 = TlTrack(1, track2)
-
-        c = core.Core(config, mixer=None, backends=[b])
-        c.tracklist.add([track1, track2])
-
-        c.history._add_track = mock.PropertyMock()
-        c.tracklist._mark_playing = mock.PropertyMock()
-
-        c.playback.play()
-        b.playback.change_track.reset_mock()
-        c.history._add_track.reset_mock()
-        c.tracklist._mark_playing.reset_mock()
-
-        c.playback.pause()
-        c.playback.next()
-        b.playback.change_track.assert_called_once_with(track2)
-        c.history._add_track.assert_called_once_with(track2)
-        c.tracklist._mark_playing.assert_called_once_with(tl_track2)
-
-
 class Bug1358RegressionTest(unittest.TestCase):
 
     def setUp(self):  # noqa: N802
@@ -942,3 +905,40 @@ def test_next_in_consume_mode_removes_unplayable_track(self):
         tl_tracks = self.core.tracklist.get_tl_tracks()
         self.assertNotIn(self.tl_tracks[0], tl_tracks)
         self.assertNotIn(self.tl_tracks[1], tl_tracks)
+
+
+class Bug1352RegressionTest(unittest.TestCase):
+    def test(self):
+        config = {
+            'core': {
+                'max_tracklist_length': 10000,
+            }
+        }
+
+        b = mock.Mock()
+        b.uri_schemes.get.return_value = ['dummy']
+        b.playback = mock.Mock(spec=backend.PlaybackProvider)
+        b.playback.change_track.return_value.get.return_value = True
+        b.playback.play.return_value.get.return_value = True
+
+        track1 = Track(uri='dummy:a', length=40000)
+        track2 = Track(uri='dummy:b', length=40000)
+
+        tl_track2 = TlTrack(1, track2)
+
+        c = core.Core(config, mixer=None, backends=[b])
+        c.tracklist.add([track1, track2])
+
+        c.history._add_track = mock.PropertyMock()
+        c.tracklist._mark_playing = mock.PropertyMock()
+
+        c.playback.play()
+        b.playback.change_track.reset_mock()
+        c.history._add_track.reset_mock()
+        c.tracklist._mark_playing.reset_mock()
+
+        c.playback.pause()
+        c.playback.next()
+        b.playback.change_track.assert_called_once_with(track2)
+        c.history._add_track.assert_called_once_with(track2)
+        c.tracklist._mark_playing.assert_called_once_with(tl_track2)