From 9e798916bd1ac093aff55c33880676eb6d5d0b58 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Thu, 29 Apr 2010 22:51:18 +0200 Subject: [PATCH] Convert gstreamer_test to use data folder helper --- tests/backends/gstreamer_test.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/backends/gstreamer_test.py b/tests/backends/gstreamer_test.py index 1f1d43b5..0f62006b 100644 --- a/tests/backends/gstreamer_test.py +++ b/tests/backends/gstreamer_test.py @@ -8,12 +8,9 @@ from mopidy.mixers.dummy import DummyMixer from mopidy.models import Playlist, Track from tests.backends.base import * -from tests import SkipTest +from tests import SkipTest, data_folder -folder = os.path.dirname(__file__) -folder = os.path.join(folder, '..', 'data') -folder = os.path.abspath(folder) -song = os.path.join(folder, 'song%s.wav') +song = data_folder('song%s.wav') generate_song = lambda i: 'file://' + urllib.pathname2url(song % i) # FIXME can be switched to generic test @@ -28,7 +25,7 @@ class GStreamerPlaybackControllerTest(BasePlaybackControllerTest, unittest.TestC backend_class = GStreamerBackend def add_track(self, file): - uri = 'file://' + urllib.pathname2url(os.path.join(folder, file)) + uri = 'file://' + urllib.pathname2url(data_folder(file)) track = Track(uri=uri, id=1, length=4464) self.backend.current_playlist.add(track)