From 60a0d182e2fecbd7e26c19c9c7e0465ef91675e8 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Fri, 19 Feb 2010 23:09:39 +0100 Subject: [PATCH] Fix test_previous_track_with_consume --- mopidy/backends/__init__.py | 6 +++--- tests/backends/basetests.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py index 8250d40b..9b658fba 100644 --- a/mopidy/backends/__init__.py +++ b/mopidy/backends/__init__.py @@ -117,14 +117,14 @@ class BasePlaybackController(object): self.stop() def next(self): - if self.consume: - self.backend.current_playlist.remove(self.current_track) - if not self.next_track: self.stop() else: self.play(self.next_track) + if self.consume: + self.backend.current_playlist.remove(self.current_track) + def previous(self): if self.previous_track: self.play(self.previous_track) diff --git a/tests/backends/basetests.py b/tests/backends/basetests.py index 82e37ff3..a48d4698 100644 --- a/tests/backends/basetests.py +++ b/tests/backends/basetests.py @@ -667,7 +667,7 @@ class BasePlaybackControllerTest(object): self.playback.consume = True self.playback.play() self.playback.next() - self.assertEqual(self.playback.current_track, None) + self.assertEqual(self.playback.previous_track, None) def test_play_with_random(self): raise NotImplementedError