From d6cfe0d1aed5eacda46f709dca8dfdfdf3744cb4 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Wed, 16 Sep 2015 23:41:16 +0200 Subject: [PATCH] tests: Update local playback tests to synchronize core state --- tests/local/test_playback.py | 220 +++++++++++++++++------------------ 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/tests/local/test_playback.py b/tests/local/test_playback.py index 490ed599..92fbe5b9 100644 --- a/tests/local/test_playback.py +++ b/tests/local/test_playback.py @@ -111,17 +111,17 @@ class LocalPlaybackProviderTest(unittest.TestCase): def test_play_mp3(self): self.add_track('local:track:blank.mp3') - self.playback.play() + self.playback.play().get() self.assert_state_is(PlaybackState.PLAYING) def test_play_ogg(self): self.add_track('local:track:blank.ogg') - self.playback.play() + self.playback.play().get() self.assert_state_is(PlaybackState.PLAYING) def test_play_flac(self): self.add_track('local:track:blank.flac') - self.playback.play() + self.playback.play().get() self.assert_state_is(PlaybackState.PLAYING) def test_play_uri_with_non_ascii_bytes(self): @@ -129,7 +129,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): # string will be decoded from ASCII to Unicode, which will crash on # non-ASCII strings, like the bytestring the following URI decodes to. self.add_track('local:track:12%20Doin%E2%80%99%20It%20Right.flac') - self.playback.play() + self.playback.play().get() self.assert_state_is(PlaybackState.PLAYING) def test_initial_state_is_stopped(self): @@ -137,7 +137,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): def test_play_with_empty_playlist(self): self.assert_state_is(PlaybackState.STOPPED) - self.playback.play() + self.playback.play().get() self.assert_state_is(PlaybackState.STOPPED) def test_play_with_empty_playlist_return_value(self): @@ -146,7 +146,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_play_state(self): self.assert_state_is(PlaybackState.STOPPED) - self.playback.play() + self.playback.play().get() self.assert_state_is(PlaybackState.PLAYING) @populate_tracklist @@ -156,7 +156,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_play_track_state(self): self.assert_state_is(PlaybackState.STOPPED) - self.playback.play(self.tl_tracks.get()[-1]) + self.playback.play(self.tl_tracks.get()[-1]).get() self.assert_state_is(PlaybackState.PLAYING) @populate_tracklist @@ -165,39 +165,39 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_play_when_playing(self): - self.playback.play() + self.playback.play().get() track = self.playback.get_current_track().get() - self.playback.play() + self.playback.play().get() self.assert_current_track_is(track) @populate_tracklist def test_play_when_paused(self): - self.playback.play() + self.playback.play().get() track = self.playback.get_current_track().get() - self.playback.pause() - self.playback.play() + self.playback.pause().get() + self.playback.play().get() self.assert_state_is(PlaybackState.PLAYING) self.assert_current_track_is(track) @populate_tracklist - def test_play_when_pause_after_next(self): - self.playback.play() + def test_play_when_paused_after_next(self): + self.playback.play().get() self.playback.next().get() self.playback.next().get() track = self.playback.get_current_track().get() - self.playback.pause() - self.playback.play() + self.playback.pause().get() + self.playback.play().get() self.assert_state_is(PlaybackState.PLAYING) self.assert_current_track_is(track) @populate_tracklist def test_play_sets_current_track(self): - self.playback.play() + self.playback.play().get() self.assert_current_track_is(self.tracks[0]) @populate_tracklist def test_play_track_sets_current_track(self): - self.playback.play(self.tl_tracks.get()[-1]) + self.playback.play(self.tl_tracks.get()[-1]).get() self.assert_current_track_is(self.tracks[-1]) @populate_tracklist @@ -212,27 +212,27 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_current_track_after_completed_playlist(self): - self.playback.play(self.tl_tracks.get()[-1]) + self.playback.play(self.tl_tracks.get()[-1]).get() self.trigger_about_to_finish() # EOS should have triggered self.assert_state_is(PlaybackState.STOPPED) self.assert_current_track_is(None) - self.playback.play(self.tl_tracks.get()[-1]) - self.playback.next() + self.playback.play(self.tl_tracks.get()[-1]).get() + self.playback.next().get() self.assert_state_is(PlaybackState.STOPPED) self.assert_current_track_is(None) @populate_tracklist def test_previous(self): - self.playback.play() + self.playback.play().get() self.playback.next().get() self.playback.previous().get() self.assert_current_track_is(self.tracks[0]) @populate_tracklist def test_previous_more(self): - self.playback.play() # At track 0 + self.playback.play().get() # At track 0 self.playback.next().get() # At track 1 self.playback.next().get() # At track 2 self.playback.previous().get() # At track 1 @@ -240,26 +240,26 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_previous_return_value(self): - self.playback.play() - self.playback.next() + self.playback.play().get() + self.playback.next().get() self.assertIsNone(self.playback.previous().get()) @populate_tracklist def test_previous_does_not_trigger_playback(self): - self.playback.play() - self.playback.next() + self.playback.play().get() + self.playback.next().get() self.playback.stop() - self.playback.previous() + self.playback.previous().get() self.assert_state_is(PlaybackState.STOPPED) @populate_tracklist def test_previous_at_start_of_playlist(self): - self.playback.previous() + self.playback.previous().get() self.assert_state_is(PlaybackState.STOPPED) self.assert_current_track_is(None) def test_previous_for_empty_playlist(self): - self.playback.previous() + self.playback.previous().get() self.assert_state_is(PlaybackState.STOPPED) self.assert_current_track_is(None) @@ -269,7 +269,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): uri = self.backend.playback.translate_uri(self.tracks[1].uri).get() self.audio.trigger_fake_playback_failure(uri) - self.playback.play(self.tl_tracks.get()[2]) + self.playback.play(self.tl_tracks.get()[2]).get() self.assert_current_track_is(self.tracks[2]) self.playback.previous().get() self.assert_current_track_is_not(self.tracks[1]) @@ -277,7 +277,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_next(self): - self.playback.play() + self.playback.play().get() old_track = self.playback.get_current_track().get() old_position = self.tracklist.index().get() @@ -289,17 +289,17 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_next_return_value(self): - self.playback.play() + self.playback.play().get() self.assertEqual(self.playback.next().get(), None) @populate_tracklist def test_next_does_not_trigger_playback(self): - self.playback.next() + self.playback.next().get() self.assert_state_is(PlaybackState.STOPPED) @populate_tracklist def test_next_at_end_of_playlist(self): - self.playback.play() + self.playback.play().get() for i, track in enumerate(self.tracks): self.assert_state_is(PlaybackState.PLAYING) @@ -312,20 +312,20 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_next_until_end_of_playlist_and_play_from_start(self): - self.playback.play() + self.playback.play().get() for _ in self.tracks: - self.playback.next() + self.playback.next().get() self.assert_current_track_is(None) self.assert_state_is(PlaybackState.STOPPED) - self.playback.play() + self.playback.play().get() self.assert_state_is(PlaybackState.PLAYING) self.assert_current_track_is(self.tracks[0]) def test_next_for_empty_playlist(self): - self.playback.next() + self.playback.next().get() self.assert_state_is(PlaybackState.STOPPED) @populate_tracklist @@ -334,7 +334,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): uri = self.backend.playback.translate_uri(self.tracks[1].uri).get() self.audio.trigger_fake_playback_failure(uri) - self.playback.play() + self.playback.play().get() self.assert_current_track_is(self.tracks[0]) self.playback.next().get() self.assert_current_track_is_not(self.tracks[1]) @@ -346,12 +346,12 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_next_track_during_play(self): - self.playback.play() + self.playback.play().get() self.assert_next_tl_track_is(self.tl_tracks.get()[1]) @populate_tracklist def test_next_track_after_previous(self): - self.playback.play() + self.playback.play().get() self.playback.next().get() self.playback.previous().get() self.assert_next_tl_track_is(self.tl_tracks.get()[1]) @@ -361,7 +361,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_next_track_at_end_of_playlist(self): - self.playback.play() + self.playback.play().get() for _ in self.tl_tracks.get()[1:]: self.playback.next().get() self.assert_next_tl_track_is(None) @@ -369,7 +369,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_next_track_at_end_of_playlist_with_repeat(self): self.tracklist.repeat = True - self.playback.play() + self.playback.play().get() for _ in self.tracks[1:]: self.playback.next().get() self.assert_next_tl_track_is(self.tl_tracks.get()[0]) @@ -385,15 +385,15 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_next_with_consume(self): self.tracklist.consume = True - self.playback.play() - self.playback.next() + self.playback.play().get() + self.playback.next().get() self.assertNotIn(self.tracks[0], self.tracklist.get_tracks().get()) @populate_tracklist def test_next_with_single_and_repeat(self): self.tracklist.single = True self.tracklist.repeat = True - self.playback.play() + self.playback.play().get() self.assert_current_track_is(self.tracks[0]) self.playback.next().get() self.assert_current_track_is(self.tracks[1]) @@ -404,7 +404,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): shuffle_mock.side_effect = lambda tracks: tracks.reverse() self.tracklist.random = True - self.playback.play() + self.playback.play().get() self.assert_current_track_is(self.tracks[-1]) self.playback.next().get() self.assert_current_track_is(self.tracks[-2]) @@ -437,7 +437,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_end_of_track(self): - self.playback.play() + self.playback.play().get() old_track = self.playback.get_current_track().get() old_position = self.tracklist.index().get() @@ -450,7 +450,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_end_of_track_return_value(self): - self.playback.play() + self.playback.play().get() self.assertEqual(self.trigger_about_to_finish(), None) @populate_tracklist @@ -460,7 +460,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_end_of_track_at_end_of_playlist(self): - self.playback.play() + self.playback.play().get() for i, track in enumerate(self.tracks): self.assert_state_is(PlaybackState.PLAYING) @@ -473,7 +473,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_end_of_track_until_end_of_playlist_and_play_from_start(self): - self.playback.play() + self.playback.play().get() for _ in self.tracks: self.trigger_about_to_finish() @@ -481,7 +481,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): self.assertEqual(self.playback.get_current_track().get(), None) self.assert_state_is(PlaybackState.STOPPED) - self.playback.play() + self.playback.play().get() self.assert_state_is(PlaybackState.PLAYING) self.assert_current_track_is(self.tracks[0]) @@ -489,14 +489,14 @@ class LocalPlaybackProviderTest(unittest.TestCase): self.trigger_about_to_finish() self.assert_state_is(PlaybackState.STOPPED) - # On about to finish does not handle skipping to next track yet. + # TODO: On about to finish does not handle skipping to next track yet. @unittest.expectedFailure @populate_tracklist def test_end_of_track_skips_to_next_track_on_failure(self): # If backend's play() returns False, it is a failure. return_values = [True, False, True] self.backend.playback.play = lambda: return_values.pop() - self.playback.play() + self.playback.play().get() self.assert_current_track_is(self.tracks[0]) self.trigger_about_to_finish() self.assert_current_track_is_not(self.tracks[1]) @@ -508,7 +508,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_end_of_track_track_during_play(self): - self.playback.play() + self.playback.play().get() self.assert_next_tl_track_is(self.tl_tracks.get()[1]) @populate_tracklist @@ -523,7 +523,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_end_of_track_track_at_end_of_playlist(self): - self.playback.play() + self.playback.play().get() for _ in self.tracks[1:]: self.trigger_about_to_finish() @@ -532,7 +532,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_end_of_track_track_at_end_of_playlist_with_repeat(self): self.tracklist.repeat = True - self.playback.play() + self.playback.play().get() for _ in self.tracks[1:]: self.trigger_about_to_finish() @@ -549,7 +549,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_end_of_track_with_consume(self): self.tracklist.consume = True - self.playback.play() + self.playback.play().get() self.trigger_about_to_finish() self.assertNotIn(self.tracks[0], self.tracklist.get_tracks().get()) @@ -559,7 +559,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): shuffle_mock.side_effect = lambda tracks: tracks.reverse() self.tracklist.random = True - self.playback.play() + self.playback.play().get() self.assert_current_track_is(self.tracks[-1]) self.trigger_about_to_finish() self.assert_current_track_is(self.tracks[-2]) @@ -597,18 +597,18 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_previous_track_after_play(self): - self.playback.play() + self.playback.play().get() self.assert_previous_tl_track_is(None) @populate_tracklist def test_previous_track_after_next(self): - self.playback.play() + self.playback.play().get() self.playback.next().get() self.assert_previous_tl_track_is(self.tl_tracks.get()[0]) @populate_tracklist def test_previous_track_after_previous(self): - self.playback.play() # At track 0 + self.playback.play().get() # At track 0 self.playback.next().get() # At track 1 self.playback.next().get() # At track 2 self.playback.previous().get() # At track 1 @@ -639,7 +639,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_current_track_during_play(self): - self.playback.play() + self.playback.play().get() self.assert_current_track_is(self.tracks[0]) @populate_tracklist @@ -654,18 +654,18 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_tracklist_position_during_play(self): - self.playback.play() + self.playback.play().get() self.assert_current_track_index_is(0) @populate_tracklist def test_tracklist_position_after_next(self): - self.playback.play() + self.playback.play().get() self.playback.next().get() self.assert_current_track_index_is(1) @populate_tracklist def test_tracklist_position_at_end_of_playlist(self): - self.playback.play(self.tl_tracks.get()[-1]) + self.playback.play(self.tl_tracks.get()[-1]).get() self.trigger_about_to_finish() # EOS should have triggered self.assert_current_track_index_is(None) @@ -677,7 +677,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_on_tracklist_change_when_playing(self): - self.playback.play() + self.playback.play().get() current_track = self.playback.get_current_track().get() self.tracklist.add([self.tracks[2]]) self.assert_state_is(PlaybackState.PLAYING) @@ -691,7 +691,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_on_tracklist_change_when_paused(self): - self.playback.play() + self.playback.play().get() self.playback.pause() current_track = self.playback.get_current_track().get() self.tracklist.add([self.tracks[2]]) @@ -705,20 +705,20 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_pause_when_playing(self): - self.playback.play() + self.playback.play().get() self.playback.pause() self.assert_state_is(PlaybackState.PAUSED) @populate_tracklist def test_pause_when_paused(self): - self.playback.play() + self.playback.play().get() self.playback.pause() self.playback.pause() self.assert_state_is(PlaybackState.PAUSED) @populate_tracklist def test_pause_return_value(self): - self.playback.play() + self.playback.play().get() self.assertIsNone(self.playback.pause().get()) @populate_tracklist @@ -728,27 +728,27 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_resume_when_playing(self): - self.playback.play() + self.playback.play().get() self.playback.resume() self.assert_state_is(PlaybackState.PLAYING) @populate_tracklist def test_resume_when_paused(self): - self.playback.play() + self.playback.play().get() self.playback.pause() self.playback.resume() self.assert_state_is(PlaybackState.PLAYING) @populate_tracklist def test_resume_return_value(self): - self.playback.play() + self.playback.play().get() self.playback.pause() self.assertIsNone(self.playback.resume().get()) @unittest.SkipTest # Uses sleep and might not work with LocalBackend @populate_tracklist def test_resume_continues_from_right_position(self): - self.playback.play() + self.playback.play().get() time.sleep(0.2) self.playback.pause() self.playback.resume() @@ -761,7 +761,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_seek_when_stopped_updates_position(self): - self.playback.seek(1000) + self.playback.seek(1000).get() position = self.playback.time_position self.assertGreaterEqual(position, 990) @@ -769,31 +769,31 @@ class LocalPlaybackProviderTest(unittest.TestCase): self.assertFalse(self.playback.seek(0).get()) def test_seek_on_empty_playlist_updates_position(self): - self.playback.seek(0) + self.playback.seek(0).get() self.assert_state_is(PlaybackState.STOPPED) @populate_tracklist def test_seek_when_stopped_triggers_play(self): - self.playback.seek(0) + self.playback.seek(0).get() self.assert_state_is(PlaybackState.PLAYING) @populate_tracklist def test_seek_when_playing(self): - self.playback.play() + self.playback.play().get() result = self.playback.seek(self.tracks[0].length - 1000) self.assert_(result, 'Seek return value was %s' % result) @populate_tracklist def test_seek_when_playing_updates_position(self): length = self.tracks[0].length - self.playback.play() - self.playback.seek(length - 1000) + self.playback.play().get() + self.playback.seek(length - 1000).get() position = self.playback.get_time_position().get() self.assertGreaterEqual(position, length - 1010) @populate_tracklist def test_seek_when_paused(self): - self.playback.play() + self.playback.play().get() self.playback.pause() result = self.playback.seek(self.tracks[0].length - 1000) self.assert_(result, 'Seek return value was %s' % result) @@ -802,7 +802,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_seek_when_paused_updates_position(self): length = self.tracks[0].length - self.playback.play() + self.playback.play().get() self.playback.pause() self.playback.seek(length - 1000) position = self.playback.get_time_position().get() @@ -812,19 +812,19 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_seek_beyond_end_of_song(self): # FIXME need to decide return value - self.playback.play() + self.playback.play().get() result = self.playback.seek(self.tracks[0].length * 100) self.assert_(not result, 'Seek return value was %s' % result) @populate_tracklist def test_seek_beyond_end_of_song_jumps_to_next_song(self): - self.playback.play() + self.playback.play().get() self.playback.seek(self.tracks[0].length * 100).get() self.assert_current_track_is(self.tracks[1]) @populate_tracklist def test_seek_beyond_end_of_song_for_last_track(self): - self.playback.play(self.tl_tracks.get()[-1]) + self.playback.play(self.tl_tracks.get()[-1]).get() self.playback.seek(self.tracks[-1].length * 100) self.assert_state_is(PlaybackState.STOPPED) @@ -835,19 +835,19 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_stop_when_playing(self): - self.playback.play() + self.playback.play().get() self.playback.stop() self.assert_state_is(PlaybackState.STOPPED) @populate_tracklist def test_stop_when_paused(self): - self.playback.play() + self.playback.play().get() self.playback.pause() self.playback.stop() self.assert_state_is(PlaybackState.STOPPED) def test_stop_return_value(self): - self.playback.play() + self.playback.play().get() self.assertIsNone(self.playback.stop().get()) def test_time_position_when_stopped(self): @@ -860,7 +860,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @unittest.SkipTest # Uses sleep and does might not work with LocalBackend @populate_tracklist def test_time_position_when_playing(self): - self.playback.play() + self.playback.play().get() first = self.playback.time_position time.sleep(1) second = self.playback.time_position @@ -868,7 +868,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_time_position_when_paused(self): - self.playback.play() + self.playback.play().get() self.playback.pause().get() first = self.playback.get_time_position().get() second = self.playback.get_time_position().get() @@ -877,13 +877,13 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_play_with_consume(self): self.tracklist.consume = True - self.playback.play() + self.playback.play().get() self.assert_current_track_is(self.tracks[0]) @populate_tracklist def test_playlist_is_empty_after_all_tracks_are_played_with_consume(self): self.tracklist.consume = True - self.playback.play() + self.playback.play().get() for t in self.tracks: self.trigger_about_to_finish() @@ -897,7 +897,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): shuffle_mock.side_effect = lambda tracks: tracks.reverse() self.tracklist.random = True - self.playback.play() + self.playback.play().get() self.assert_current_track_is(self.tracks[-1]) @populate_tracklist @@ -906,7 +906,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): shuffle_mock.side_effect = lambda tracks: tracks.reverse() self.tracklist.random = True - self.playback.play() + self.playback.play().get() self.playback.next().get() current_track = self.playback.get_current_track().get() self.playback.previous() @@ -914,7 +914,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_end_of_song_starts_next_track(self): - self.playback.play() + self.playback.play().get() self.trigger_about_to_finish() self.assert_current_track_is(self.tracks[1]) @@ -922,7 +922,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): def test_end_of_song_with_single_and_repeat_starts_same(self): self.tracklist.single = True self.tracklist.repeat = True - self.playback.play() + self.playback.play().get() self.assert_current_track_is(self.tracks[0]) self.trigger_about_to_finish() self.assert_current_track_is(self.tracks[0]) @@ -932,7 +932,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): self.tracklist.single = True self.tracklist.repeat = True self.tracklist.random = True - self.playback.play() + self.playback.play().get() current_track = self.playback.get_current_track().get() self.trigger_about_to_finish() self.assert_current_track_is(current_track) @@ -940,7 +940,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_end_of_song_with_single_stops(self): self.tracklist.single = True - self.playback.play() + self.playback.play().get() self.assert_current_track_is(self.tracks[0]) self.trigger_about_to_finish() self.assert_current_track_is(None) @@ -951,7 +951,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): def test_end_of_song_with_single_and_random_stops(self): self.tracklist.single = True self.tracklist.random = True - self.playback.play() + self.playback.play().get() self.trigger_about_to_finish() # EOS should have triggered self.assert_current_track_is(None) @@ -959,7 +959,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_end_of_playlist_stops(self): - self.playback.play(self.tl_tracks.get()[-1]) + self.playback.play(self.tl_tracks.get()[-1]).get() self.trigger_about_to_finish() # EOS should have triggered self.assert_state_is(PlaybackState.STOPPED) @@ -976,7 +976,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_random_until_end_of_playlist(self): self.tracklist.random = True - self.playback.play() + self.playback.play().get() for _ in self.tracks[1:]: self.playback.next().get() self.assert_next_tl_track_is(None) @@ -984,7 +984,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_random_with_eot_until_end_of_playlist(self): self.tracklist.random = True - self.playback.play() + self.playback.play().get() for _ in self.tracks[1:]: self.trigger_about_to_finish() @@ -993,7 +993,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_random_until_end_of_playlist_and_play_from_start(self): self.tracklist.random = True - self.playback.play() + self.playback.play().get() for _ in self.tracks: self.playback.next().get() self.assert_next_tl_track_is_not(None) @@ -1004,21 +1004,21 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_random_with_eot_until_end_of_playlist_and_play_from_start(self): self.tracklist.random = True - self.playback.play() + self.playback.play().get() for _ in self.tracks: self.trigger_about_to_finish() # EOS should have triggered self.assert_eot_tl_track_is_not(None) self.assert_state_is(PlaybackState.STOPPED) - self.playback.play() + self.playback.play().get() self.assert_state_is(PlaybackState.PLAYING) @populate_tracklist def test_random_until_end_of_playlist_with_repeat(self): self.tracklist.repeat = True self.tracklist.random = True - self.playback.play() + self.playback.play().get() for _ in self.tracks[1:]: self.playback.next() self.assert_next_tl_track_is_not(None) @@ -1026,7 +1026,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): @populate_tracklist def test_played_track_during_random_not_played_again(self): self.tracklist.random = True - self.playback.play() + self.playback.play().get() played = [] for _ in self.tracks: track = self.playback.get_current_track().get() @@ -1043,7 +1043,7 @@ class LocalPlaybackProviderTest(unittest.TestCase): expected = self.tl_tracks.get()[::-1] + [None] actual = [] - self.playback.play() + self.playback.play().get() self.tracklist.random = True while self.playback.get_state().get() != PlaybackState.STOPPED: self.playback.next().get()