From d8986e6cc1f21f5dafcc86d69e820ccb24fa6f35 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Fri, 4 Sep 2015 15:28:32 +0200 Subject: [PATCH] audio: Tell dummy_audio what urls to fail on --- tests/audio/test_actor.py | 8 ++++---- tests/dummy_audio.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/audio/test_actor.py b/tests/audio/test_actor.py index 2811f3bd..314d1d42 100644 --- a/tests/audio/test_actor.py +++ b/tests/audio/test_actor.py @@ -59,7 +59,7 @@ class BaseTest(unittest.TestCase): def tearDown(self): # noqa pykka.ActorRegistry.stop_all() - def possibly_trigger_fake_playback_error(self): + def possibly_trigger_fake_playback_error(self, uri): pass def possibly_trigger_fake_about_to_finish(self): @@ -69,8 +69,8 @@ class BaseTest(unittest.TestCase): class DummyMixin(object): audio_class = dummy_audio.DummyAudio - def possibly_trigger_fake_playback_error(self): - self.audio.trigger_fake_playback_failure() + def possibly_trigger_fake_playback_error(self, uri): + self.audio.trigger_fake_playback_failure(uri) def possibly_trigger_fake_about_to_finish(self): callback = self.audio.get_about_to_finish_callback().get() @@ -86,7 +86,7 @@ class AudioTest(BaseTest): self.assertTrue(self.audio.start_playback().get()) def test_start_playback_non_existing_file(self): - self.possibly_trigger_fake_playback_error() + self.possibly_trigger_fake_playback_error(self.uris[0] + 'bogus') self.audio.prepare_change() self.audio.set_uri(self.uris[0] + 'bogus') diff --git a/tests/dummy_audio.py b/tests/dummy_audio.py index 443d376b..ad663d4a 100644 --- a/tests/dummy_audio.py +++ b/tests/dummy_audio.py @@ -24,9 +24,9 @@ class DummyAudio(pykka.ThreadingActor): self._position = 0 self._callback = None self._uri = None - self._state_change_result = True self._stream_changed = False self._tags = {} + self._bad_uris = set() def set_uri(self, uri): assert self._uri is None, 'prepare change not called before set' @@ -110,10 +110,10 @@ class DummyAudio(pykka.ThreadingActor): self._tags['audio-codec'] = [u'fake info...'] audio.AudioListener.send('tags_changed', tags=['audio-codec']) - return self._state_change_result + return self._uri not in self._bad_uris - def trigger_fake_playback_failure(self): - self._state_change_result = False + def trigger_fake_playback_failure(self, uri): + self._bad_uris.add(uri) def trigger_fake_tags_changed(self, tags): self._tags.update(tags)