From 79771d6e2ce09c9fcca254c46d862e4db9362fb3 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 7 Apr 2011 15:55:03 +0200 Subject: [PATCH] Rename data_folder() to path_to_data_dir() --- tests/__init__.py | 10 ++-- tests/backends/base/library.py | 6 +- tests/backends/base/stored_playlists.py | 6 +- tests/backends/local/__init__.py | 4 +- tests/backends/local/library_test.py | 6 +- tests/backends/local/playback_test.py | 4 +- tests/backends/local/stored_playlists_test.py | 4 +- tests/backends/local/translator_test.py | 56 +++++++++---------- tests/outputs/gstreamer_test.py | 4 +- tests/scanner_test.py | 8 +-- tests/utils/path_test.py | 6 +- 11 files changed, 57 insertions(+), 57 deletions(-) diff --git a/tests/__init__.py b/tests/__init__.py index 82073e97..1d4d2e3d 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -16,9 +16,9 @@ from mopidy import settings # Nuke any local settings to ensure same test env all over settings.local.clear() -def data_folder(name): - folder = os.path.dirname(__file__) - folder = os.path.join(folder, 'data') - folder = os.path.abspath(folder) - return os.path.join(folder, name) +def path_to_data_dir(name): + path = os.path.dirname(__file__) + path = os.path.join(path, 'data') + path = os.path.abspath(path) + return os.path.join(path, name) diff --git a/tests/backends/base/library.py b/tests/backends/base/library.py index bff26c4c..2a3de730 100644 --- a/tests/backends/base/library.py +++ b/tests/backends/base/library.py @@ -1,6 +1,6 @@ from mopidy.models import Playlist, Track, Album, Artist -from tests import SkipTest, data_folder +from tests import SkipTest, path_to_data_dir class LibraryControllerTest(object): artists = [Artist(name='artist1'), Artist(name='artist2'), Artist()] @@ -8,9 +8,9 @@ class LibraryControllerTest(object): Album(name='album2', artists=artists[1:2]), Album()] tracks = [Track(name='track1', length=4000, artists=artists[:1], - album=albums[0], uri='file://' + data_folder('uri1')), + album=albums[0], uri='file://' + path_to_data_dir('uri1')), Track(name='track2', length=4000, artists=artists[1:2], - album=albums[1], uri='file://' + data_folder('uri2')), + album=albums[1], uri='file://' + path_to_data_dir('uri2')), Track()] def setUp(self): diff --git a/tests/backends/base/stored_playlists.py b/tests/backends/base/stored_playlists.py index 12e48256..839d5bed 100644 --- a/tests/backends/base/stored_playlists.py +++ b/tests/backends/base/stored_playlists.py @@ -5,13 +5,13 @@ import tempfile from mopidy import settings from mopidy.models import Playlist -from tests import SkipTest, data_folder +from tests import SkipTest, path_to_data_dir class StoredPlaylistsControllerTest(object): def setUp(self): settings.LOCAL_PLAYLIST_PATH = tempfile.mkdtemp() - settings.LOCAL_TAG_CACHE_FILE = data_folder('library_tag_cache') - settings.LOCAL_MUSIC_PATH = data_folder('') + settings.LOCAL_TAG_CACHE_FILE = path_to_data_dir('library_tag_cache') + settings.LOCAL_MUSIC_PATH = path_to_data_dir('') self.backend = self.backend_class() self.stored = self.backend.stored_playlists diff --git a/tests/backends/local/__init__.py b/tests/backends/local/__init__.py index 60a1bd4d..d2213297 100644 --- a/tests/backends/local/__init__.py +++ b/tests/backends/local/__init__.py @@ -1,6 +1,6 @@ from mopidy.utils.path import path_to_uri -from tests import data_folder +from tests import path_to_data_dir -song = data_folder('song%s.wav') +song = path_to_data_dir('song%s.wav') generate_song = lambda i: path_to_uri(song % i) diff --git a/tests/backends/local/library_test.py b/tests/backends/local/library_test.py index 0c44924a..68ab22e9 100644 --- a/tests/backends/local/library_test.py +++ b/tests/backends/local/library_test.py @@ -9,7 +9,7 @@ if sys.platform == 'win32': from mopidy import settings from mopidy.backends.local import LocalBackend -from tests import data_folder +from tests import path_to_data_dir from tests.backends.base.library import LibraryControllerTest class LocalLibraryControllerTest(LibraryControllerTest, unittest.TestCase): @@ -17,8 +17,8 @@ class LocalLibraryControllerTest(LibraryControllerTest, unittest.TestCase): backend_class = LocalBackend def setUp(self): - settings.LOCAL_TAG_CACHE_FILE = data_folder('library_tag_cache') - settings.LOCAL_MUSIC_PATH = data_folder('') + settings.LOCAL_TAG_CACHE_FILE = path_to_data_dir('library_tag_cache') + settings.LOCAL_MUSIC_PATH = path_to_data_dir('') super(LocalLibraryControllerTest, self).setUp() diff --git a/tests/backends/local/playback_test.py b/tests/backends/local/playback_test.py index 2007cff8..2cdeadb9 100644 --- a/tests/backends/local/playback_test.py +++ b/tests/backends/local/playback_test.py @@ -11,7 +11,7 @@ from mopidy.backends.local import LocalBackend from mopidy.models import Track from mopidy.utils.path import path_to_uri -from tests import data_folder +from tests import path_to_data_dir from tests.backends.base.playback import PlaybackControllerTest from tests.backends.local import generate_song @@ -32,7 +32,7 @@ class LocalPlaybackControllerTest(PlaybackControllerTest, unittest.TestCase): settings.runtime.clear() def add_track(self, path): - uri = path_to_uri(data_folder(path)) + uri = path_to_uri(path_to_data_dir(path)) track = Track(uri=uri, length=4464) self.backend.current_playlist.add(track) diff --git a/tests/backends/local/stored_playlists_test.py b/tests/backends/local/stored_playlists_test.py index 5bc16d1c..b426e9ce 100644 --- a/tests/backends/local/stored_playlists_test.py +++ b/tests/backends/local/stored_playlists_test.py @@ -14,7 +14,7 @@ from mopidy.mixers.dummy import DummyMixer from mopidy.models import Playlist, Track from mopidy.utils.path import path_to_uri -from tests import data_folder +from tests import path_to_data_dir from tests.backends.base.stored_playlists import \ StoredPlaylistsControllerTest from tests.backends.local import generate_song @@ -65,7 +65,7 @@ class LocalStoredPlaylistsControllerTest(StoredPlaylistsControllerTest, self.assertEqual(uri, contents.strip()) def test_playlists_are_loaded_at_startup(self): - track = Track(uri=path_to_uri(data_folder('uri2'))) + track = Track(uri=path_to_uri(path_to_data_dir('uri2'))) playlist = Playlist(tracks=[track], name='test') self.stored.save(playlist) diff --git a/tests/backends/local/translator_test.py b/tests/backends/local/translator_test.py index b7fd212c..a4e9f317 100644 --- a/tests/backends/local/translator_test.py +++ b/tests/backends/local/translator_test.py @@ -8,26 +8,26 @@ from mopidy.utils.path import path_to_uri from mopidy.backends.local.translator import parse_m3u, parse_mpd_tag_cache from mopidy.models import Track, Artist, Album -from tests import SkipTest, data_folder +from tests import SkipTest, path_to_data_dir -song1_path = data_folder('song1.mp3') -song2_path = data_folder('song2.mp3') -encoded_path = data_folder(u'æøå.mp3') +song1_path = path_to_data_dir('song1.mp3') +song2_path = path_to_data_dir('song2.mp3') +encoded_path = path_to_data_dir(u'æøå.mp3') song1_uri = path_to_uri(song1_path) song2_uri = path_to_uri(song2_path) encoded_uri = path_to_uri(encoded_path) class M3UToUriTest(unittest.TestCase): def test_empty_file(self): - uris = parse_m3u(data_folder('empty.m3u')) + uris = parse_m3u(path_to_data_dir('empty.m3u')) self.assertEqual([], uris) def test_basic_file(self): - uris = parse_m3u(data_folder('one.m3u')) + uris = parse_m3u(path_to_data_dir('one.m3u')) self.assertEqual([song1_uri], uris) def test_file_with_comment(self): - uris = parse_m3u(data_folder('comment.m3u')) + uris = parse_m3u(path_to_data_dir('comment.m3u')) self.assertEqual([song1_uri], uris) def test_file_with_absolute_files(self): @@ -64,11 +64,11 @@ class M3UToUriTest(unittest.TestCase): os.remove(tmp.name) def test_encoding_is_latin1(self): - uris = parse_m3u(data_folder('encoding.m3u')) + uris = parse_m3u(path_to_data_dir('encoding.m3u')) self.assertEqual([encoded_uri], uris) def test_open_missing_file(self): - uris = parse_m3u(data_folder('non-existant.m3u')) + uris = parse_m3u(path_to_data_dir('non-existant.m3u')) self.assertEqual([], uris) @@ -81,7 +81,7 @@ expected_albums = [Album(name='albumname', artists=expected_artists, expected_tracks = [] def generate_track(path, ident): - uri = path_to_uri(data_folder(path)) + uri = path_to_uri(path_to_data_dir(path)) track = Track(name='trackname', artists=expected_artists, track_no=1, album=expected_albums[0], length=4000, uri=uri) expected_tracks.append(track) @@ -98,28 +98,28 @@ generate_track('subdir1/subsubdir/song9.mp3', 1) class MPDTagCacheToTracksTest(unittest.TestCase): def test_emtpy_cache(self): - tracks = parse_mpd_tag_cache(data_folder('empty_tag_cache'), - data_folder('')) + tracks = parse_mpd_tag_cache(path_to_data_dir('empty_tag_cache'), + path_to_data_dir('')) self.assertEqual(set(), tracks) def test_simple_cache(self): - tracks = parse_mpd_tag_cache(data_folder('simple_tag_cache'), - data_folder('')) - uri = path_to_uri(data_folder('song1.mp3')) + tracks = parse_mpd_tag_cache(path_to_data_dir('simple_tag_cache'), + path_to_data_dir('')) + uri = path_to_uri(path_to_data_dir('song1.mp3')) track = Track(name='trackname', artists=expected_artists, track_no=1, album=expected_albums[0], length=4000, uri=uri) self.assertEqual(set([track]), tracks) def test_advanced_cache(self): - tracks = parse_mpd_tag_cache(data_folder('advanced_tag_cache'), - data_folder('')) + tracks = parse_mpd_tag_cache(path_to_data_dir('advanced_tag_cache'), + path_to_data_dir('')) self.assertEqual(set(expected_tracks), tracks) def test_unicode_cache(self): - tracks = parse_mpd_tag_cache(data_folder('utf8_tag_cache'), - data_folder('')) + tracks = parse_mpd_tag_cache(path_to_data_dir('utf8_tag_cache'), + path_to_data_dir('')) - uri = path_to_uri(data_folder('song1.mp3')) + uri = path_to_uri(path_to_data_dir('song1.mp3')) artists = [Artist(name=u'æøå')] album = Album(name=u'æøå', artists=artists) track = Track(uri=uri, name=u'æøå', artists=artists, @@ -132,14 +132,14 @@ class MPDTagCacheToTracksTest(unittest.TestCase): raise SkipTest def test_cache_with_blank_track_info(self): - tracks = parse_mpd_tag_cache(data_folder('blank_tag_cache'), - data_folder('')) - uri = path_to_uri(data_folder('song1.mp3')) + tracks = parse_mpd_tag_cache(path_to_data_dir('blank_tag_cache'), + path_to_data_dir('')) + uri = path_to_uri(path_to_data_dir('song1.mp3')) self.assertEqual(set([Track(uri=uri, length=4000)]), tracks) def test_musicbrainz_tagcache(self): - tracks = parse_mpd_tag_cache(data_folder('musicbrainz_tag_cache'), - data_folder('')) + tracks = parse_mpd_tag_cache(path_to_data_dir('musicbrainz_tag_cache'), + path_to_data_dir('')) artist = list(expected_tracks[0].artists)[0].copy( musicbrainz_id='7364dea6-ca9a-48e3-be01-b44ad0d19897') albumartist = list(expected_tracks[0].artists)[0].copy( @@ -153,9 +153,9 @@ class MPDTagCacheToTracksTest(unittest.TestCase): self.assertEqual(track, list(tracks)[0]) def test_albumartist_tag_cache(self): - tracks = parse_mpd_tag_cache(data_folder('albumartist_tag_cache'), - data_folder('')) - uri = path_to_uri(data_folder('song1.mp3')) + tracks = parse_mpd_tag_cache(path_to_data_dir('albumartist_tag_cache'), + path_to_data_dir('')) + uri = path_to_uri(path_to_data_dir('song1.mp3')) artist = Artist(name='albumartistname') album = expected_albums[0].copy(artists=[artist]) track = Track(name='trackname', artists=expected_artists, track_no=1, diff --git a/tests/outputs/gstreamer_test.py b/tests/outputs/gstreamer_test.py index d2e3c263..31a16756 100644 --- a/tests/outputs/gstreamer_test.py +++ b/tests/outputs/gstreamer_test.py @@ -12,12 +12,12 @@ from mopidy import settings from mopidy.outputs.gstreamer import GStreamerOutput from mopidy.utils.path import path_to_uri -from tests import data_folder +from tests import path_to_data_dir class GStreamerOutputTest(unittest.TestCase): def setUp(self): settings.BACKENDS = ('mopidy.backends.local.LocalBackend',) - self.song_uri = path_to_uri(data_folder('song1.wav')) + self.song_uri = path_to_uri(path_to_data_dir('song1.wav')) self.output = GStreamerOutput() self.output.on_start() diff --git a/tests/scanner_test.py b/tests/scanner_test.py index a1b53bcf..b98c5aa9 100644 --- a/tests/scanner_test.py +++ b/tests/scanner_test.py @@ -4,7 +4,7 @@ from datetime import date from mopidy.scanner import Scanner, translator from mopidy.models import Track, Artist, Album -from tests import data_folder +from tests import path_to_data_dir class FakeGstDate(object): def __init__(self, year, month, day): @@ -132,12 +132,12 @@ class ScannerTest(unittest.TestCase): self.data = {} def scan(self, path): - scanner = Scanner(data_folder(path), + scanner = Scanner(path_to_data_dir(path), self.data_callback, self.error_callback) scanner.start() def check(self, name, key, value): - name = data_folder(name) + name = path_to_data_dir(name) self.assertEqual(self.data[name][key], value) def data_callback(self, data): @@ -159,7 +159,7 @@ class ScannerTest(unittest.TestCase): def test_uri_is_set(self): self.scan('scanner/simple') self.check('scanner/simple/song1.mp3', 'uri', 'file://' - + data_folder('scanner/simple/song1.mp3')) + + path_to_data_dir('scanner/simple/song1.mp3')) def test_duration_is_set(self): self.scan('scanner/simple') diff --git a/tests/utils/path_test.py b/tests/utils/path_test.py index 3743d59e..088a7049 100644 --- a/tests/utils/path_test.py +++ b/tests/utils/path_test.py @@ -9,7 +9,7 @@ import unittest from mopidy.utils.path import (get_or_create_folder, mtime, path_to_uri, uri_to_path, split_path, find_files) -from tests import data_folder +from tests import path_to_data_dir class GetOrCreateFolderTest(unittest.TestCase): def setUp(self): @@ -117,7 +117,7 @@ class SplitPathTest(unittest.TestCase): class FindFilesTest(unittest.TestCase): def find(self, path): - return list(find_files(data_folder(path))) + return list(find_files(path_to_data_dir(path))) def test_basic_folder(self): self.assert_(self.find('')) @@ -128,7 +128,7 @@ class FindFilesTest(unittest.TestCase): def test_file(self): files = self.find('blank.mp3') self.assertEqual(len(files), 1) - self.assert_(files[0], data_folder('blank.mp3')) + self.assert_(files[0], path_to_data_dir('blank.mp3')) def test_names_are_unicode(self): is_unicode = lambda f: isinstance(f, unicode)