From 470e4f4edf4d634ab3c77544d401cf6c29dc9b0b Mon Sep 17 00:00:00 2001 From: souliane Date: Mon, 24 Feb 2014 12:57:56 +0100 Subject: [PATCH] test: skip radiocol tests if the sound samples are not found --- src/test/test_plugin_misc_radiocol.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/test/test_plugin_misc_radiocol.py b/src/test/test_plugin_misc_radiocol.py index 114a100a..4411d83d 100644 --- a/src/test/test_plugin_misc_radiocol.py +++ b/src/test/test_plugin_misc_radiocol.py @@ -32,6 +32,7 @@ from twisted.words.xish import domish from twisted.internet import reactor from twisted.internet import defer from twisted.python.failure import Failure +from twisted.trial.unittest import SkipTest from mutagen.oggvorbis import OggVorbis @@ -70,9 +71,12 @@ class RadiocolTest(helpers.SatTestCase): self.songs = [] self.playlist = [] self.sound_dir = self.host.memory.getConfig('', 'media_dir') + '/test/sound/' - for filename in os.listdir(self.sound_dir): - if filename.endswith('.ogg'): - self.songs.append(filename) + try: + for filename in os.listdir(self.sound_dir): + if filename.endswith('.ogg'): + self.songs.append(filename) + except OSError: + raise SkipTest('The sound samples in sat_media/test/sound were not found') def _buildPlayers(self, players=[]): """@return: the "started" content built with the given players"""