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

Fix tests broken by the two previous cherry-picked commits

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-06-30 00:23:28 +02:00
parent 6ae2ce5772
commit 93b606af3e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy/backends/__init__.py
View File

@ -536,7 +536,7 @@ class BasePlaybackController(object):
# FIXME handle in play aswell?
if self.consume:
self.backend.current_playlist.remove(original_track)
self.backend.current_playlist.remove(id=original_track.id)
if self.random and self.current_track in self._shuffled:
self._shuffled.remove(self.current_track)

2
mopidy/mpd/frontend.py
View File

@ -294,7 +294,7 @@ class MpdFrontend(object):
if not tracks:
raise MpdArgError(u'Bad song index', command=u'delete')
for track in tracks:
self.backend.current_playlist.remove(cpid=track.cpid)
self.backend.current_playlist.remove(id=track.id)
@handle_pattern(r'^delete "(?P<songpos>\d+)"$')
def _current_playlist_delete_songpos(self, songpos):

10
tests/backends/base.py
View File

@ -240,18 +240,18 @@ class BaseCurrentPlaylistControllerTest(object):
def test_remove(self):
track1 = self.controller.tracks[1]
track2 = self.controller.tracks[2]
self.controller.remove(track1)
self.controller.remove(id=track1.id)
self.assert_(track1 not in self.controller.tracks)
self.assertEqual(track2, self.controller.tracks[1])
@populate_playlist
def test_removing_track_that_does_not_exist(self):
test = lambda: self.controller.remove(Track())
self.assertRaises(AssertionError, test)
test = lambda: self.controller.remove(id=12345)
self.assertRaises(LookupError, test)
def test_removing_from_empty_playlist(self):
test = lambda: self.controller.remove(Track())
self.assertRaises(AssertionError, test)
test = lambda: self.controller.remove(id=12345)
self.assertRaises(LookupError, test)
@populate_playlist
def test_shuffle(self):

6
tests/mpd/frontend_test.py
View File

@ -601,7 +601,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
def test_delete_songpos(self):
self.b.current_playlist.load(
[Track(), Track(), Track(), Track(), Track()])
[Track(id=1), Track(id=2), Track(id=3), Track(id=4), Track(id=5)])
self.assertEqual(len(self.b.current_playlist.tracks), 5)
result = self.h.handle_request(u'delete "2"')
self.assertEqual(len(self.b.current_playlist.tracks), 4)
@ -617,7 +617,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
def test_delete_open_range(self):
self.b.current_playlist.load(
[Track(), Track(), Track(), Track(), Track()])
[Track(id=1), Track(id=2), Track(id=3), Track(id=4), Track(id=5)])
self.assertEqual(len(self.b.current_playlist.tracks), 5)
result = self.h.handle_request(u'delete "1:"')
self.assertEqual(len(self.b.current_playlist.tracks), 1)
@ -625,7 +625,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
def test_delete_closed_range(self):
self.b.current_playlist.load(
[Track(), Track(), Track(), Track(), Track()])
[Track(id=1), Track(id=2), Track(id=3), Track(id=4), Track(id=5)])
self.assertEqual(len(self.b.current_playlist.tracks), 5)
result = self.h.handle_request(u'delete "1:3"')
self.assertEqual(len(self.b.current_playlist.tracks), 3)