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

Setting the state to STOPPED right before starting a track makes the test fail as it should

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-10-24 20:40:47 +02:00
parent d6fce1cf72
commit c9535ffe10
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mopidy/backends/base/playback.py
View File

@ -383,6 +383,7 @@ class BasePlaybackController(object):
self.resume() self.resume()
if cp_track is not None: if cp_track is not None:
self.state = self.STOPPED
self.current_cp_track = cp_track self.current_cp_track = cp_track
self.state = self.PLAYING self.state = self.PLAYING
if not self._play(cp_track[1]): if not self._play(cp_track[1]):

5
tests/frontends/mpd/playback_test.py
View File

@ -288,13 +288,14 @@ class PlaybackControlHandlerTest(unittest.TestCase):
def test_playid_minus_one_resumes_if_paused(self): def test_playid_minus_one_resumes_if_paused(self):
self.b.current_playlist.append([Track(length=40000)]) self.b.current_playlist.append([Track(length=40000)])
self.b.playback.seek(30000) self.b.playback.seek(30000)
self.assert_(self.b.playback.time_position >= 30000)
self.assertEquals(self.b.playback.PLAYING, self.b.playback.state)
self.b.playback.pause() self.b.playback.pause()
self.assertEquals(self.b.playback.PAUSED, self.b.playback.state)
result = self.h.handle_request(u'playid "-1"') result = self.h.handle_request(u'playid "-1"')
self.assert_(u'OK' in result) self.assert_(u'OK' in result)
self.assertEqual(self.b.playback.PLAYING, self.b.playback.state) self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
self.assert_(self.b.playback.time_position >= 30000) self.assert_(self.b.playback.time_position >= 30000)
self.fail(u'This test should fail, but it does not. '
'The functionality is not implemented.')
def test_playid_which_does_not_exist(self): def test_playid_which_does_not_exist(self):
self.b.current_playlist.append([Track()]) self.b.current_playlist.append([Track()])