Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-21 14:56:02 +01:00
Code Issues Projects Releases Wiki Activity

Tests for #1285: parameterize tests

Browse source 
Also remove an errant `print` and use `rb''` literals for regexes.
This commit is contained in:
Adrian Sampson 2015-01-31 11:24:27 -08:00
parent e99adddb11
commit 614fbf20ca
2 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
beets/importer.py
View file

@ -1457,7 +1457,7 @@ def albums_in_dir(path):
match = marker_pat.match(subdir)
if match:
subdir_pat = re.compile(
b'^%s\d' % re.escape(match.group(1)), re.I
br'^%s\d' % re.escape(match.group(1)), re.I
)
else:
start_collapsing = False
@ -1478,9 +1478,8 @@ def albums_in_dir(path):
start_collapsing = True
# Set the current pattern to match directories with the same
# prefix as this one, followed by a digit.
print(repr(re.escape(match.group(1))))
collapse_pat = re.compile(
b'^%s\d' % re.escape(match.group(1)), re.I
br'^%s\d' % re.escape(match.group(1)), re.I
)
break

40
test/test_importer.py
View file

@ -1380,12 +1380,19 @@ class AlbumsInDirTest(_common.TestCase):
class MultiDiscAlbumsInDirTest(_common.TestCase):
def setUp(self):
super(MultiDiscAlbumsInDirTest, self).setUp()
def create_music(self, files=True, ascii=True):
"""Create some music in multiple album directories.
`files` indicates whether to create the files (otherwise, only
directories are made). `ascii` indicates ACII-only filenames;
otherwise, we use Unicode names.
"""
self.base = os.path.abspath(os.path.join(self.temp_dir, b'tempdir'))
os.mkdir(self.base)
name = b'CAT' if ascii else b'CÁT'
name_alt_case = b'CAt' if ascii else b'CÁt'
self.dirs = [
# Nested album, multiple subdirs.
# Also, false positive marker in root dir, and subtitle for disc 3.
@ -1401,28 +1408,34 @@ class MultiDiscAlbumsInDirTest(_common.TestCase):
# Flattened album, case typo.
# Also, false positive marker in parent dir.
os.path.join(self.base, b'artist [CD5]'),
os.path.join(self.base, b'artist [CD5]', b'CÀT disc 1'),
os.path.join(self.base, b'artist [CD5]', b'CÀt disc 2'),
os.path.join(self.base, b'artist [CD5]', name + b' disc 1'),
os.path.join(self.base, b'artist [CD5]',
name_alt_case + b' disc 2'),
# Single disc album, sorted between CAT discs.
os.path.join(self.base, b'artist [CD5]', b'CÀTS'),
os.path.join(self.base, b'artist [CD5]', name + b'S'),
]
self.files = [
os.path.join(self.base, b'ABCD1234', b'cd 1', b'song1.mp3'),
os.path.join(self.base, b'ABCD1234', b'cd 3 - bonus', b'song2.mp3'),
os.path.join(self.base, b'ABCD1234', b'cd 3 - bonus', b'song3.mp3'),
os.path.join(self.base, b'album', b'cd _ 1', b'song4.mp3'),
os.path.join(self.base, b'artist [CD5]', b'CÀT disc 1', b'song5.mp3'),
os.path.join(self.base, b'artist [CD5]', b'CÀt disc 2', b'song6.mp3'),
os.path.join(self.base, b'artist [CD5]', b'CÀTS', b'song7.mp3'),
os.path.join(self.base, b'artist [CD5]', name + b' disc 1',
b'song5.mp3'),
os.path.join(self.base, b'artist [CD5]',
name_alt_case + b' disc 2', b'song6.mp3'),
os.path.join(self.base, b'artist [CD5]', name + b'S',
b'song7.mp3'),
]
for path in self.dirs:
os.mkdir(path)
for path in self.files:
_mkmp3(path)
if files:
for path in self.files:
_mkmp3(path)
def test_coalesce_nested_album_multiple_subdirs(self):
self.create_music()
albums = list(albums_in_dir(self.base))
self.assertEquals(len(albums), 4)
root, items = albums[0]
@ -1430,27 +1443,28 @@ class MultiDiscAlbumsInDirTest(_common.TestCase):
self.assertEquals(len(items), 3)
def test_coalesce_nested_album_single_subdir(self):
self.create_music()
albums = list(albums_in_dir(self.base))
root, items = albums[1]
self.assertEquals(root, self.dirs[3:5])
self.assertEquals(len(items), 1)
def test_coalesce_flattened_album_case_typo(self):
self.create_music()
albums = list(albums_in_dir(self.base))
root, items = albums[2]
self.assertEquals(root, self.dirs[6:8])
self.assertEquals(len(items), 2)
def test_single_disc_album(self):
self.create_music()
albums = list(albums_in_dir(self.base))
root, items = albums[3]
self.assertEquals(root, self.dirs[8:])
self.assertEquals(len(items), 1)
def test_do_not_yield_empty_album(self):
# Remove all the MP3s.
for path in self.files:
os.remove(path)
self.create_music(files=False)
albums = list(albums_in_dir(self.base))
self.assertEquals(len(albums), 0)