From 65c8dbc9064debe8e62aa9d1818d47d80ae3b64f Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Wed, 5 May 2010 20:16:41 +0200 Subject: [PATCH] Fix tests with respect to dependecies between backends --- tests/backends/base.py | 14 ++++++++++++-- tests/backends/gstreamer_test.py | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/backends/base.py b/tests/backends/base.py index 2974b316..56bd3dd5 100644 --- a/tests/backends/base.py +++ b/tests/backends/base.py @@ -960,16 +960,26 @@ class BaseStoredPlaylistsControllerTest(object): backend_class = None def setUp(self): - self.original_folder = settings.PLAYLIST_FOLDER + self.original_playlist_folder = settings.PLAYLIST_FOLDER + self.original_tag_cache = settings.TAG_CACHE + self.original_music_folder = settings.MUSIC_FOLDER + settings.PLAYLIST_FOLDER = tempfile.mkdtemp() + settings.TAG_CACHE = data_folder('library_tag_cache') + settings.MUSIC_FOLDER = data_folder('') + self.backend = self.backend_class(mixer=DummyMixer()) self.stored = self.backend.stored_playlists def tearDown(self): self.backend.destroy() + if os.path.exists(settings.PLAYLIST_FOLDER): shutil.rmtree(settings.PLAYLIST_FOLDER) - settings.PLAYLIST_FOLDER = self.original_folder + + settings.PLAYLIST_FOLDER = self.original_playlist_folder + settings.TAG_CACHE = self.original_tag_cache + settings.MUSIC_FOLDER = self.original_music_folder def test_create(self): playlist = self.stored.create('test') diff --git a/tests/backends/gstreamer_test.py b/tests/backends/gstreamer_test.py index 7e682d36..7ea0c5d1 100644 --- a/tests/backends/gstreamer_test.py +++ b/tests/backends/gstreamer_test.py @@ -98,7 +98,7 @@ class GStreamerStoredPlaylistsControllerTest(BaseStoredPlaylistsControllerTest, self.assertEqual(uri, contents.strip()) def test_playlists_are_loaded_at_startup(self): - track = Track(uri=generate_song(1)) + track = Track(uri=path_to_uri(data_folder('uri2'))) playlist = Playlist(tracks=[track], name='test') self.stored.save(playlist)