andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix next track test and implementation

Browse Source
This commit is contained in:
Thomas Adamcik 2010-02-14 03:39:05 +01:00
parent a7571ef6f2
commit a6e5e5d89d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mopidy/backends/__init__.py
View File

@ -120,11 +120,12 @@ class BasePlaybackController(object):
@property @property
def next_track(self): def next_track(self):
if self.current_track is None: playlist = self.backend.current_playlist.playlist
return None
try: try:
return self.backend.current_playlist.playlist.tracks[ if self.current_track is None:
self.playlist_position + 1] return playlist.tracks[self.playlist_position]
return playlist.tracks[self.playlist_position + 1]
except IndexError: except IndexError:
return None return None

3
tests/backends/basetests.py
View File

@ -252,9 +252,8 @@ class BasePlaybackControllerTest(object):
@populate_playlist @populate_playlist
def test_next_track_before_play(self): def test_next_track_before_play(self):
# FIXME should next_track reflect which track is about to be played?
tracks = self.backend.current_playlist.playlist.tracks tracks = self.backend.current_playlist.playlist.tracks
self.assertEqual(self.playback.next_track, None) self.assertEqual(self.playback.next_track, tracks[0])
@populate_playlist @populate_playlist
def test_next_track_during_play(self): def test_next_track_during_play(self):