John Doe
beets song lyrics
-
Send "beets song" Ringtone to your Cell 
+
Send "beets song" Ringtone to your Cell The purpose of beets is to get your music collection right once and for all. It catalogs your collection, automatically improving its metadata as it goes. It then provides a bouquet of tools for manipulating and accessing your music.
+
+ {{:: 'cloud_flare_always_on_short_message' | i18n }}
+
Check @genius for updates. We'll have things fixed soon. +
+
+
+
+
+Check @genius for updates. We'll have things fixed soon. +
+
+
+
+
+
+
+
+
+ GENIUS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Beets is awesome!
+
+
+
+
+
+
+
+ More on Genius
+
+
+
+
+
+
+
+
+
+
+
+
+ Denzel Curry’s ZillaKami Collaboration “EVIL TWIN” Is His Latest Song To Flip A Wu-Tang Clan Classic
+
+
+
+
+
+
+
+
+ Denzel Curry Links Up With Kenny Beats To Drop A Freestyle In ‘The Cave’
+
+
+
+
+
+ Miley Cyrus References Wu-Tang Clan’s Biggest Hit On “D.R.E.A.M. (Drugs Rule Everything Around Me)”
+
+
+
+
+
+
+
+
+
+
+
+
+ + About “C.R.E.A.M.” +
+ + +
+
+
+ Arguably one of the most iconic songs in hip-hop, the underlying idea of “C.R.E.A.M.” is found in its title—cash rules everything. The timeless piano riffs and background vocals come from a chopped up sample of The Charmels‘ 1967 record, “As Long As I’ve Got You,” that make up the entire track.
+ +Although it was released as an official single in 1994, “C.R.E.A.M.” was first recorded in 1991, around the same time as RZA’s assault case, and featured himself and Ghostface Killah. The track went through several revisions and was later re-recorded by Raekwon and Inspectah Deck in 1993—an early title of the song was “Lifestyles of the Mega-Rich.”
+ +In 2017, RZA explained to Power 106 how the final version of the track came together:
+ ++ +Once we got to the studio, I decided that this track had to be on the Wu-Tang album. I reminded Rae and Deck of their verses—their verses were long. […] Method Man, the master of hooks at the time, came in with this hook right here: ‘cash rules everything around me, cream, get the money.’ Once he added that element, I knew it was going to be a smash.
Since its release, the song and chorus have been referenced countless times by several artists. It has also been featured in movies such as Eminem’s 8 Mile and the N.W.A biopic, Straight Outta Compton.
+
+
+
+
+
+
+ -
+
+
-
+ ++ +
What has RZA said about the song?
++ ++ + +
+
+
+ -
+ ++ +
What has Raekwon said about the song?
+++ + ++
+ + +‘C.R.E.A.M.’ did a lot for my career personally. It gave me an opportunity to revisit the times where that cream meant that much to us. So, yeah, when I think of this record it just automatically puts me back into ‘87/’88 where we were standing in front of the building. It’s cold outside. We didn’t care. We’re out there, all black on trying to make dollars. Just trying to make some money and trying to eat. Survive.
+ +This song, I remember writing to the beat a long time ago before we actually came out. That beat is old. That was probably like a ‘89 beat. RZA had it that long because he had a bunch of breaks. He had all kind of things and he was making beats back then, but we was just picking and that beat happened to always sit around and I would be like, ‘I want that beat, so don’t give that beat to nobody.’ And he kept his word and let me have it.
+ +Meth came up with the hook but our dude named Raider Ruckus, this was like Meth’s homeboy back then, like they was real close, he came up with the phrase ‘cash rules everything around me.’ So when he showed Meth what it was and was like, ‘Cash rules everything around me,’ Meth was like, ‘Word, you right!’ And turned it into a movie, and I came in later that day and heard it and co-signed it.
+
+
+
+ -
+ ++ +
What has U-God said about the song?
+++ + +
+ +“C.R.E.A.M.” is a true song. Everything Inspectah Deck and Raekwon said is 100 percent true. Not one line in that entire song is a lie, or even a slight exaggeration. Deck did sell base, and he did go to jail at the age of fifteen. Rae was sticking up white boys on ball courts, rocking the same damn ’Lo sweater. And of “course, Meth on the hook was like butter on the popcorn. Meth knew the hard times, too, being out there smoking woolies and pumping crack, etc. That raspy shit he was kicking just echoed in everyone’s head long after the song was done playing.
The realism on “C.R.E.A.M.” is what resonates with so many people all over the world. People everywhere know that sentiment of being slaves to the dollar. Cash is king, and we are its lowly subjects. That’s pretty much the case in every nation around the world, the desperation to put your life and your freedom on the line to make a couple dollars. Whether you’re working, stripping, hustling, or slinging, whether you’re a business owner or homeless, cash rules everything around us.Source: Raw:My Journey into Wu-Tang
+
+
+
+ -
+ ++ +
What songs were sampled on the beat for “C.R.E.A.M.?”
+++ + +The vocals and background sample that can be heard on the song’s intro were taken taken from The Charmels’ 1967 song “As Long as I’ve Got You”:
+ + + +The classic keys sample that can be heard throughout the beat was also taken from the previously mentioned song:
+ + +
+
+
+ -
+ ++ +
What has Method Man said about the song?
+++ + +Meth told Complex,
+ ++
+‘C.R.E.A.M.’ was the one that really put us on the map if you wanna be technical. I wasn’t there when they recorded ‘C.R.E.A.M.’ I came in after the fact. RZA was like, ‘Put a hook on this song’ and I put a hook on it. That’s how it always went. I liked doing hooks.
+ +The hook for that was done by my man Raider Ruckus. We used to work at the Statue of Liberty and when we were coming home we used to come up with all these made-up words that were acronyms.
+ +We had words like ‘BIBWAM’ which meant, ‘Bitches Is Busted Without A Man’ and all this other crazy shit. Raider Ruckus was so ill with the way he put the words together. We would call money ‘cream’ so he took each letter and made a word out of it and killed it the way he did it.
+ +Something like that had never been done before as far as a hook or even a way of speaking. This is just showing and proving that we paid attention in class when we was kids. You can’t do shit like that unless you got a brain in your fucking head! You got to have some level of intelligence to do something like that.
+ +The best acronym for a word that I heard was ‘P.R.O.J.E.C.T.S.’ by Killah Priest. He said ‘People Relying On Just Enough Cash To Survive.’ And he’s the one that came up with ‘Basic Instructions Before Leaving Earth,’ the acronym for B.I.B.L.E. This ain’t no fluke shit man.
+ +There’s a reason you got millions upon millions of fucking kids running around with Wu-Tang tattoos. You don’t just put something on your body permanently unless it’s official. At that time, when you’re coming out brand new and representing where you come from, everybody from that area wants you to win because they win. That’s what it was like for us.
+ +We were the only dudes from Staten Island doing it so everybody from Staten Island wanted us to win. Not just dudes from Staten Island, but dudes from Brooklyn too because they had peoples in the group too. Then it was just grimy niggas who loved to see real shit, saying, ‘We riding with them Wu-Tang niggas. Fuck all that shiny suit shit!’ That ain’t no take on Puff, a lot of niggas was wearing suits and shit man, but that ain’t us.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.
+
+
+
+ Bring Da Ruckus
+
+
+
+
+
+
+
+
+
+
+ 2.
+
+
+
+ Shame On A Nigga
+
+
+
+
+
+
+
+
+
+
+ 3.
+
+
+
+ Clan in Da Front
+
+
+
+
+
+
+
+
+
+
+ 4.
+
+
+
+ Wu-Tang: 7th Chamber
+
+
+
+
+
+
+
+
+
+
+ 5.
+
+
+
+ Can It Be All So Simple / Intermission
+
+
+
+
+
+
+
+
+
+
+ 6.
+
+
+
+ Da Mystery of Chessboxin’
+
+
+
+
+
+
+
+
+
+
+ 7.
+
+
+
+ Wu-Tang Clan Ain’t Nuthing ta Fuck Wit
+
+
+
+
+
+
+
+
+
+
+ 8.
+
+
+
+ C.R.E.A.M.
+
+
+
+
+
+
+
+
+
+
+ 9.
+
+
+
+ Method Man
+
+
+
+
+
+
+
+
+
+
+ 10.
+
+
+
+ Protect Ya Neck
+
+
+
+
+
+
+
+
+
+
+ 11.
+
+
+
+ Tearz
+
+
+
+
+
+
+
+
+
+
+ 12.
+
+
+
+ Wu-Tang: 7th Chamber - Pt. II
+
+
+
+
+
+
+
+
+
+
+ 13.
+
+
+
+ Conclusion
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SONG Lyrics
+
+
+
+ !!!! MISSING LYRICS HERE !!!
+
+
+
+
+
+ More on g-example
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/rsrc/lyricstext.yaml b/test/rsrc/lyricstext.yaml
index 7ae1a70e7..af6b09877 100644
--- a/test/rsrc/lyricstext.yaml
+++ b/test/rsrc/lyricstext.yaml
@@ -1,7 +1,7 @@
# Song used by LyricsGooglePluginMachineryTest
Beets_song: |
- beets is the media library management system for obsessive-compulsive music geeks the purpose of
+ beets is the media library management system for obsessive music geeks the purpose of
beets is to get your music collection right once and for all it catalogs your collection
automatically improving its metadata as it goes it then provides a bouquet of tools for
manipulating and accessing your music here's an example of beets' brainy tag corrector doing its
diff --git a/test/test_acousticbrainz.py b/test/test_acousticbrainz.py
index 0b1407581..4c0b0137b 100644
--- a/test/test_acousticbrainz.py
+++ b/test/test_acousticbrainz.py
@@ -95,7 +95,9 @@ class MapDataToSchemeTest(unittest.TestCase):
('danceable', 0.143928021193),
('rhythm', 'VienneseWaltz'),
('mood_electronic', 0.339881360531),
- ('mood_happy', 0.0894767045975)
+ ('mood_happy', 0.0894767045975),
+ ('moods_mirex', "Cluster3"),
+ ('timbre', "bright")
}
self.assertEqual(mapping, expected)
diff --git a/test/test_art.py b/test/test_art.py
index 556222f48..f4b3a6e62 100644
--- a/test/test_art.py
+++ b/test/test_art.py
@@ -159,9 +159,9 @@ class FSArtTest(UseThePlugin):
class CombinedTest(FetchImageHelper, UseThePlugin):
ASIN = 'xxxx'
MBID = 'releaseid'
- AMAZON_URL = 'http://images.amazon.com/images/P/{0}.01.LZZZZZZZ.jpg' \
+ AMAZON_URL = 'https://images.amazon.com/images/P/{0}.01.LZZZZZZZ.jpg' \
.format(ASIN)
- AAO_URL = 'http://www.albumart.org/index_detail.php?asin={0}' \
+ AAO_URL = 'https://www.albumart.org/index_detail.php?asin={0}' \
.format(ASIN)
CAA_URL = 'coverartarchive.org/release/{0}/front' \
.format(MBID)
@@ -240,7 +240,7 @@ class CombinedTest(FetchImageHelper, UseThePlugin):
class AAOTest(UseThePlugin):
ASIN = 'xxxx'
- AAO_URL = 'http://www.albumart.org/index_detail.php?asin={0}'.format(ASIN)
+ AAO_URL = 'https://www.albumart.org/index_detail.php?asin={0}'.format(ASIN)
def setUp(self):
super(AAOTest, self).setUp()
diff --git a/test/test_autotag.py b/test/test_autotag.py
index 28b7fd209..febd1641d 100644
--- a/test/test_autotag.py
+++ b/test/test_autotag.py
@@ -18,7 +18,6 @@
from __future__ import division, absolute_import, print_function
import re
-import copy
import unittest
from test import _common
@@ -91,7 +90,10 @@ class PluralityTest(_common.TestCase):
for i in range(5)]
likelies, _ = match.current_metadata(items)
for f in fields:
- self.assertEqual(likelies[f], '%s_1' % f)
+ if isinstance(likelies[f], int):
+ self.assertEqual(likelies[f], 0)
+ else:
+ self.assertEqual(likelies[f], '%s_1' % f)
def _make_item(title, track, artist=u'some artist'):
@@ -103,9 +105,12 @@ def _make_item(title, track, artist=u'some artist'):
def _make_trackinfo():
return [
- TrackInfo(u'one', None, artist=u'some artist', length=1, index=1),
- TrackInfo(u'two', None, artist=u'some artist', length=1, index=2),
- TrackInfo(u'three', None, artist=u'some artist', length=1, index=3),
+ TrackInfo(title=u'one', track_id=None, artist=u'some artist',
+ length=1, index=1),
+ TrackInfo(title=u'two', track_id=None, artist=u'some artist',
+ length=1, index=2),
+ TrackInfo(title=u'three', track_id=None, artist=u'some artist',
+ length=1, index=3),
]
@@ -345,9 +350,7 @@ class AlbumDistanceTest(_common.TestCase):
artist=u'some artist',
album=u'some album',
tracks=_make_trackinfo(),
- va=False,
- album_id=None,
- artist_id=None,
+ va=False
)
self.assertEqual(self._dist(items, info), 0)
@@ -359,9 +362,7 @@ class AlbumDistanceTest(_common.TestCase):
artist=u'some artist',
album=u'some album',
tracks=_make_trackinfo(),
- va=False,
- album_id=None,
- artist_id=None,
+ va=False
)
dist = self._dist(items, info)
self.assertNotEqual(dist, 0)
@@ -377,9 +378,7 @@ class AlbumDistanceTest(_common.TestCase):
artist=u'someone else',
album=u'some album',
tracks=_make_trackinfo(),
- va=False,
- album_id=None,
- artist_id=None,
+ va=False
)
self.assertNotEqual(self._dist(items, info), 0)
@@ -392,9 +391,7 @@ class AlbumDistanceTest(_common.TestCase):
artist=u'should be ignored',
album=u'some album',
tracks=_make_trackinfo(),
- va=True,
- album_id=None,
- artist_id=None,
+ va=True
)
self.assertEqual(self._dist(items, info), 0)
@@ -408,9 +405,7 @@ class AlbumDistanceTest(_common.TestCase):
artist=u'should be ignored',
album=u'some album',
tracks=_make_trackinfo(),
- va=True,
- album_id=None,
- artist_id=None,
+ va=True
)
info.tracks[0].artist = None
info.tracks[1].artist = None
@@ -426,9 +421,7 @@ class AlbumDistanceTest(_common.TestCase):
artist=u'some artist',
album=u'some album',
tracks=_make_trackinfo(),
- va=True,
- album_id=None,
- artist_id=None,
+ va=True
)
self.assertNotEqual(self._dist(items, info), 0)
@@ -441,9 +434,7 @@ class AlbumDistanceTest(_common.TestCase):
artist=u'some artist',
album=u'some album',
tracks=_make_trackinfo(),
- va=False,
- album_id=None,
- artist_id=None,
+ va=False
)
dist = self._dist(items, info)
self.assertTrue(0 < dist < 0.2)
@@ -457,9 +448,7 @@ class AlbumDistanceTest(_common.TestCase):
artist=u'some artist',
album=u'some album',
tracks=_make_trackinfo(),
- va=False,
- album_id=None,
- artist_id=None,
+ va=False
)
info.tracks[0].medium_index = 1
info.tracks[1].medium_index = 2
@@ -476,9 +465,7 @@ class AlbumDistanceTest(_common.TestCase):
artist=u'some artist',
album=u'some album',
tracks=_make_trackinfo(),
- va=False,
- album_id=None,
- artist_id=None,
+ va=False
)
info.tracks[0].medium_index = 1
info.tracks[1].medium_index = 2
@@ -500,9 +487,9 @@ class AssignmentTest(unittest.TestCase):
items.append(self.item(u'three', 2))
items.append(self.item(u'two', 3))
trackinfo = []
- trackinfo.append(TrackInfo(u'one', None))
- trackinfo.append(TrackInfo(u'two', None))
- trackinfo.append(TrackInfo(u'three', None))
+ trackinfo.append(TrackInfo(title=u'one'))
+ trackinfo.append(TrackInfo(title=u'two'))
+ trackinfo.append(TrackInfo(title=u'three'))
mapping, extra_items, extra_tracks = \
match.assign_items(items, trackinfo)
self.assertEqual(extra_items, [])
@@ -519,9 +506,9 @@ class AssignmentTest(unittest.TestCase):
items.append(self.item(u'three', 1))
items.append(self.item(u'two', 1))
trackinfo = []
- trackinfo.append(TrackInfo(u'one', None))
- trackinfo.append(TrackInfo(u'two', None))
- trackinfo.append(TrackInfo(u'three', None))
+ trackinfo.append(TrackInfo(title=u'one'))
+ trackinfo.append(TrackInfo(title=u'two'))
+ trackinfo.append(TrackInfo(title=u'three'))
mapping, extra_items, extra_tracks = \
match.assign_items(items, trackinfo)
self.assertEqual(extra_items, [])
@@ -537,9 +524,9 @@ class AssignmentTest(unittest.TestCase):
items.append(self.item(u'one', 1))
items.append(self.item(u'three', 3))
trackinfo = []
- trackinfo.append(TrackInfo(u'one', None))
- trackinfo.append(TrackInfo(u'two', None))
- trackinfo.append(TrackInfo(u'three', None))
+ trackinfo.append(TrackInfo(title=u'one'))
+ trackinfo.append(TrackInfo(title=u'two'))
+ trackinfo.append(TrackInfo(title=u'three'))
mapping, extra_items, extra_tracks = \
match.assign_items(items, trackinfo)
self.assertEqual(extra_items, [])
@@ -555,8 +542,8 @@ class AssignmentTest(unittest.TestCase):
items.append(self.item(u'two', 2))
items.append(self.item(u'three', 3))
trackinfo = []
- trackinfo.append(TrackInfo(u'one', None))
- trackinfo.append(TrackInfo(u'three', None))
+ trackinfo.append(TrackInfo(title=u'one'))
+ trackinfo.append(TrackInfo(title=u'three'))
mapping, extra_items, extra_tracks = \
match.assign_items(items, trackinfo)
self.assertEqual(extra_items, [items[1]])
@@ -592,7 +579,8 @@ class AssignmentTest(unittest.TestCase):
items.append(item(12, 186.45916150485752))
def info(index, title, length):
- return TrackInfo(title, None, length=length, index=index)
+ return TrackInfo(title=title, length=length,
+ index=index)
trackinfo = []
trackinfo.append(info(1, u'Alone', 238.893))
trackinfo.append(info(2, u'The Woman in You', 341.44))
@@ -635,8 +623,8 @@ class ApplyTest(_common.TestCase, ApplyTestUtil):
self.items.append(Item({}))
trackinfo = []
trackinfo.append(TrackInfo(
- u'oneNew',
- u'dfa939ec-118c-4d0f-84a0-60f3d1e6522c',
+ title=u'oneNew',
+ track_id=u'dfa939ec-118c-4d0f-84a0-60f3d1e6522c',
medium=1,
medium_index=1,
medium_total=1,
@@ -645,8 +633,8 @@ class ApplyTest(_common.TestCase, ApplyTestUtil):
artist_sort='trackArtistSort',
))
trackinfo.append(TrackInfo(
- u'twoNew',
- u'40130ed1-a27c-42fd-a328-1ebefb6caef4',
+ title=u'twoNew',
+ track_id=u'40130ed1-a27c-42fd-a328-1ebefb6caef4',
medium=2,
medium_index=1,
index=2,
@@ -746,13 +734,13 @@ class ApplyTest(_common.TestCase, ApplyTestUtil):
self.assertEqual(self.items[1].albumtype, 'album')
def test_album_artist_overrides_empty_track_artist(self):
- my_info = copy.deepcopy(self.info)
+ my_info = self.info.copy()
self._apply(info=my_info)
self.assertEqual(self.items[0].artist, 'artistNew')
self.assertEqual(self.items[1].artist, 'artistNew')
def test_album_artist_overridden_by_nonempty_track_artist(self):
- my_info = copy.deepcopy(self.info)
+ my_info = self.info.copy()
my_info.tracks[0].artist = 'artist1!'
my_info.tracks[1].artist = 'artist2!'
self._apply(info=my_info)
@@ -774,7 +762,7 @@ class ApplyTest(_common.TestCase, ApplyTestUtil):
self.assertEqual(self.items[1].artist_sort, 'albumArtistSort')
def test_full_date_applied(self):
- my_info = copy.deepcopy(self.info)
+ my_info = self.info.copy()
my_info.year = 2013
my_info.month = 12
my_info.day = 18
@@ -789,7 +777,7 @@ class ApplyTest(_common.TestCase, ApplyTestUtil):
self.items.append(Item(year=1, month=2, day=3))
self.items.append(Item(year=4, month=5, day=6))
- my_info = copy.deepcopy(self.info)
+ my_info = self.info.copy()
my_info.year = 2013
self._apply(info=my_info)
@@ -809,7 +797,7 @@ class ApplyTest(_common.TestCase, ApplyTestUtil):
self.assertEqual(self.items[0].day, 3)
def test_data_source_applied(self):
- my_info = copy.deepcopy(self.info)
+ my_info = self.info.copy()
my_info.data_source = 'MusicBrainz'
self._apply(info=my_info)
@@ -825,15 +813,15 @@ class ApplyCompilationTest(_common.TestCase, ApplyTestUtil):
self.items.append(Item({}))
trackinfo = []
trackinfo.append(TrackInfo(
- u'oneNew',
- u'dfa939ec-118c-4d0f-84a0-60f3d1e6522c',
+ title=u'oneNew',
+ track_id=u'dfa939ec-118c-4d0f-84a0-60f3d1e6522c',
artist=u'artistOneNew',
artist_id=u'a05686fc-9db2-4c23-b99e-77f5db3e5282',
index=1,
))
trackinfo.append(TrackInfo(
- u'twoNew',
- u'40130ed1-a27c-42fd-a328-1ebefb6caef4',
+ title=u'twoNew',
+ track_id=u'40130ed1-a27c-42fd-a328-1ebefb6caef4',
artist=u'artistTwoNew',
artist_id=u'80b3cf5e-18fe-4c59-98c7-e5bb87210710',
index=2,
@@ -871,7 +859,7 @@ class ApplyCompilationTest(_common.TestCase, ApplyTestUtil):
self.assertFalse(self.items[1].comp)
def test_va_flag_sets_comp(self):
- va_info = copy.deepcopy(self.info)
+ va_info = self.info.copy()
va_info.va = True
self._apply(info=va_info)
self.assertTrue(self.items[0].comp)
diff --git a/test/test_beatport.py b/test/test_beatport.py
new file mode 100644
index 000000000..fb39627f8
--- /dev/null
+++ b/test/test_beatport.py
@@ -0,0 +1,630 @@
+# -*- coding: utf-8 -*-
+# This file is part of beets.
+# Copyright 2016, Adrian Sampson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+"""Tests for the 'beatport' plugin.
+"""
+from __future__ import division, absolute_import, print_function
+
+import unittest
+from test import _common
+from test.helper import TestHelper
+import six
+from datetime import timedelta
+
+from beetsplug import beatport
+from beets import library
+
+
+class BeatportTest(_common.TestCase, TestHelper):
+ def _make_release_response(self):
+ """Returns a dict that mimics a response from the beatport API.
+
+ The results were retrieved from:
+ https://oauth-api.beatport.com/catalog/3/releases?id=1742984
+ The list of elements on the returned dict is incomplete, including just
+ those required for the tests on this class.
+ """
+ results = {
+ "id": 1742984,
+ "type": "release",
+ "name": "Charade",
+ "slug": "charade",
+ "releaseDate": "2016-04-11",
+ "publishDate": "2016-04-11",
+ "audioFormat": "",
+ "category": "Release",
+ "currentStatus": "General Content",
+ "catalogNumber": "GR089",
+ "description": "",
+ "label": {
+ "id": 24539,
+ "name": "Gravitas Recordings",
+ "type": "label",
+ "slug": "gravitas-recordings"
+ },
+ "artists": [{
+ "id": 326158,
+ "name": "Supersillyus",
+ "slug": "supersillyus",
+ "type": "artist"
+ }],
+ "genres": [{
+ "id": 9,
+ "name": "Breaks",
+ "slug": "breaks",
+ "type": "genre"
+ }],
+ }
+ return results
+
+ def _make_tracks_response(self):
+ """Return a list that mimics a response from the beatport API.
+
+ The results were retrieved from:
+ https://oauth-api.beatport.com/catalog/3/tracks?releaseId=1742984
+ The list of elements on the returned list is incomplete, including just
+ those required for the tests on this class.
+ """
+ results = [{
+ "id": 7817567,
+ "type": "track",
+ "sku": "track-7817567",
+ "name": "Mirage a Trois",
+ "trackNumber": 1,
+ "mixName": "Original Mix",
+ "title": "Mirage a Trois (Original Mix)",
+ "slug": "mirage-a-trois-original-mix",
+ "releaseDate": "2016-04-11",
+ "publishDate": "2016-04-11",
+ "currentStatus": "General Content",
+ "length": "7:05",
+ "lengthMs": 425421,
+ "bpm": 90,
+ "key": {
+ "standard": {
+ "letter": "G",
+ "sharp": False,
+ "flat": False,
+ "chord": "minor"
+ },
+ "shortName": "Gmin"
+ },
+ "artists": [{
+ "id": 326158,
+ "name": "Supersillyus",
+ "slug": "supersillyus",
+ "type": "artist"
+ }],
+ "genres": [{
+ "id": 9,
+ "name": "Breaks",
+ "slug": "breaks",
+ "type": "genre"
+ }],
+ "subGenres": [{
+ "id": 209,
+ "name": "Glitch Hop",
+ "slug": "glitch-hop",
+ "type": "subgenre"
+ }],
+ "release": {
+ "id": 1742984,
+ "name": "Charade",
+ "type": "release",
+ "slug": "charade"
+ },
+ "label": {
+ "id": 24539,
+ "name": "Gravitas Recordings",
+ "type": "label",
+ "slug": "gravitas-recordings",
+ "status": True
+ }
+ }, {
+ "id": 7817568,
+ "type": "track",
+ "sku": "track-7817568",
+ "name": "Aeon Bahamut",
+ "trackNumber": 2,
+ "mixName": "Original Mix",
+ "title": "Aeon Bahamut (Original Mix)",
+ "slug": "aeon-bahamut-original-mix",
+ "releaseDate": "2016-04-11",
+ "publishDate": "2016-04-11",
+ "currentStatus": "General Content",
+ "length": "7:38",
+ "lengthMs": 458000,
+ "bpm": 100,
+ "key": {
+ "standard": {
+ "letter": "G",
+ "sharp": False,
+ "flat": False,
+ "chord": "major"
+ },
+ "shortName": "Gmaj"
+ },
+ "artists": [{
+ "id": 326158,
+ "name": "Supersillyus",
+ "slug": "supersillyus",
+ "type": "artist"
+ }],
+ "genres": [{
+ "id": 9,
+ "name": "Breaks",
+ "slug": "breaks",
+ "type": "genre"
+ }],
+ "subGenres": [{
+ "id": 209,
+ "name": "Glitch Hop",
+ "slug": "glitch-hop",
+ "type": "subgenre"
+ }],
+ "release": {
+ "id": 1742984,
+ "name": "Charade",
+ "type": "release",
+ "slug": "charade"
+ },
+ "label": {
+ "id": 24539,
+ "name": "Gravitas Recordings",
+ "type": "label",
+ "slug": "gravitas-recordings",
+ "status": True
+ }
+ }, {
+ "id": 7817569,
+ "type": "track",
+ "sku": "track-7817569",
+ "name": "Trancendental Medication",
+ "trackNumber": 3,
+ "mixName": "Original Mix",
+ "title": "Trancendental Medication (Original Mix)",
+ "slug": "trancendental-medication-original-mix",
+ "releaseDate": "2016-04-11",
+ "publishDate": "2016-04-11",
+ "currentStatus": "General Content",
+ "length": "1:08",
+ "lengthMs": 68571,
+ "bpm": 141,
+ "key": {
+ "standard": {
+ "letter": "F",
+ "sharp": False,
+ "flat": False,
+ "chord": "major"
+ },
+ "shortName": "Fmaj"
+ },
+ "artists": [{
+ "id": 326158,
+ "name": "Supersillyus",
+ "slug": "supersillyus",
+ "type": "artist"
+ }],
+ "genres": [{
+ "id": 9,
+ "name": "Breaks",
+ "slug": "breaks",
+ "type": "genre"
+ }],
+ "subGenres": [{
+ "id": 209,
+ "name": "Glitch Hop",
+ "slug": "glitch-hop",
+ "type": "subgenre"
+ }],
+ "release": {
+ "id": 1742984,
+ "name": "Charade",
+ "type": "release",
+ "slug": "charade"
+ },
+ "label": {
+ "id": 24539,
+ "name": "Gravitas Recordings",
+ "type": "label",
+ "slug": "gravitas-recordings",
+ "status": True
+ }
+ }, {
+ "id": 7817570,
+ "type": "track",
+ "sku": "track-7817570",
+ "name": "A List of Instructions for When I'm Human",
+ "trackNumber": 4,
+ "mixName": "Original Mix",
+ "title": "A List of Instructions for When I'm Human (Original Mix)",
+ "slug": "a-list-of-instructions-for-when-im-human-original-mix",
+ "releaseDate": "2016-04-11",
+ "publishDate": "2016-04-11",
+ "currentStatus": "General Content",
+ "length": "6:57",
+ "lengthMs": 417913,
+ "bpm": 88,
+ "key": {
+ "standard": {
+ "letter": "A",
+ "sharp": False,
+ "flat": False,
+ "chord": "minor"
+ },
+ "shortName": "Amin"
+ },
+ "artists": [{
+ "id": 326158,
+ "name": "Supersillyus",
+ "slug": "supersillyus",
+ "type": "artist"
+ }],
+ "genres": [{
+ "id": 9,
+ "name": "Breaks",
+ "slug": "breaks",
+ "type": "genre"
+ }],
+ "subGenres": [{
+ "id": 209,
+ "name": "Glitch Hop",
+ "slug": "glitch-hop",
+ "type": "subgenre"
+ }],
+ "release": {
+ "id": 1742984,
+ "name": "Charade",
+ "type": "release",
+ "slug": "charade"
+ },
+ "label": {
+ "id": 24539,
+ "name": "Gravitas Recordings",
+ "type": "label",
+ "slug": "gravitas-recordings",
+ "status": True
+ }
+ }, {
+ "id": 7817571,
+ "type": "track",
+ "sku": "track-7817571",
+ "name": "The Great Shenanigan",
+ "trackNumber": 5,
+ "mixName": "Original Mix",
+ "title": "The Great Shenanigan (Original Mix)",
+ "slug": "the-great-shenanigan-original-mix",
+ "releaseDate": "2016-04-11",
+ "publishDate": "2016-04-11",
+ "currentStatus": "General Content",
+ "length": "9:49",
+ "lengthMs": 589875,
+ "bpm": 123,
+ "key": {
+ "standard": {
+ "letter": "E",
+ "sharp": False,
+ "flat": True,
+ "chord": "major"
+ },
+ "shortName": "E♭maj"
+ },
+ "artists": [{
+ "id": 326158,
+ "name": "Supersillyus",
+ "slug": "supersillyus",
+ "type": "artist"
+ }],
+ "genres": [{
+ "id": 9,
+ "name": "Breaks",
+ "slug": "breaks",
+ "type": "genre"
+ }],
+ "subGenres": [{
+ "id": 209,
+ "name": "Glitch Hop",
+ "slug": "glitch-hop",
+ "type": "subgenre"
+ }],
+ "release": {
+ "id": 1742984,
+ "name": "Charade",
+ "type": "release",
+ "slug": "charade"
+ },
+ "label": {
+ "id": 24539,
+ "name": "Gravitas Recordings",
+ "type": "label",
+ "slug": "gravitas-recordings",
+ "status": True
+ }
+ }, {
+ "id": 7817572,
+ "type": "track",
+ "sku": "track-7817572",
+ "name": "Charade",
+ "trackNumber": 6,
+ "mixName": "Original Mix",
+ "title": "Charade (Original Mix)",
+ "slug": "charade-original-mix",
+ "releaseDate": "2016-04-11",
+ "publishDate": "2016-04-11",
+ "currentStatus": "General Content",
+ "length": "7:05",
+ "lengthMs": 425423,
+ "bpm": 123,
+ "key": {
+ "standard": {
+ "letter": "A",
+ "sharp": False,
+ "flat": False,
+ "chord": "major"
+ },
+ "shortName": "Amaj"
+ },
+ "artists": [{
+ "id": 326158,
+ "name": "Supersillyus",
+ "slug": "supersillyus",
+ "type": "artist"
+ }],
+ "genres": [{
+ "id": 9,
+ "name": "Breaks",
+ "slug": "breaks",
+ "type": "genre"
+ }],
+ "subGenres": [{
+ "id": 209,
+ "name": "Glitch Hop",
+ "slug": "glitch-hop",
+ "type": "subgenre"
+ }],
+ "release": {
+ "id": 1742984,
+ "name": "Charade",
+ "type": "release",
+ "slug": "charade"
+ },
+ "label": {
+ "id": 24539,
+ "name": "Gravitas Recordings",
+ "type": "label",
+ "slug": "gravitas-recordings",
+ "status": True
+ }
+ }]
+ return results
+
+ def setUp(self):
+ self.setup_beets()
+ self.load_plugins('beatport')
+ self.lib = library.Library(':memory:')
+
+ # Set up 'album'.
+ response_release = self._make_release_response()
+ self.album = beatport.BeatportRelease(response_release)
+
+ # Set up 'tracks'.
+ response_tracks = self._make_tracks_response()
+ self.tracks = [beatport.BeatportTrack(t) for t in response_tracks]
+
+ # Set up 'test_album'.
+ self.test_album = self.mk_test_album()
+
+ # Set up 'test_tracks'
+ self.test_tracks = self.test_album.items()
+
+ def tearDown(self):
+ self.unload_plugins()
+ self.teardown_beets()
+
+ def mk_test_album(self):
+ items = [_common.item() for _ in range(6)]
+ for item in items:
+ item.album = 'Charade'
+ item.catalognum = 'GR089'
+ item.label = 'Gravitas Recordings'
+ item.artist = 'Supersillyus'
+ item.year = 2016
+ item.comp = False
+ item.label_name = 'Gravitas Recordings'
+ item.genre = 'Glitch Hop'
+ item.year = 2016
+ item.month = 4
+ item.day = 11
+ item.mix_name = 'Original Mix'
+
+ items[0].title = 'Mirage a Trois'
+ items[1].title = 'Aeon Bahamut'
+ items[2].title = 'Trancendental Medication'
+ items[3].title = 'A List of Instructions for When I\'m Human'
+ items[4].title = 'The Great Shenanigan'
+ items[5].title = 'Charade'
+
+ items[0].length = timedelta(minutes=7, seconds=5).total_seconds()
+ items[1].length = timedelta(minutes=7, seconds=38).total_seconds()
+ items[2].length = timedelta(minutes=1, seconds=8).total_seconds()
+ items[3].length = timedelta(minutes=6, seconds=57).total_seconds()
+ items[4].length = timedelta(minutes=9, seconds=49).total_seconds()
+ items[5].length = timedelta(minutes=7, seconds=5).total_seconds()
+
+ items[0].url = 'mirage-a-trois-original-mix'
+ items[1].url = 'aeon-bahamut-original-mix'
+ items[2].url = 'trancendental-medication-original-mix'
+ items[3].url = 'a-list-of-instructions-for-when-im-human-original-mix'
+ items[4].url = 'the-great-shenanigan-original-mix'
+ items[5].url = 'charade-original-mix'
+
+ counter = 0
+ for item in items:
+ counter += 1
+ item.track_number = counter
+
+ items[0].bpm = 90
+ items[1].bpm = 100
+ items[2].bpm = 141
+ items[3].bpm = 88
+ items[4].bpm = 123
+ items[5].bpm = 123
+
+ items[0].initial_key = 'Gmin'
+ items[1].initial_key = 'Gmaj'
+ items[2].initial_key = 'Fmaj'
+ items[3].initial_key = 'Amin'
+ items[4].initial_key = 'E♭maj'
+ items[5].initial_key = 'Amaj'
+
+ for item in items:
+ self.lib.add(item)
+
+ album = self.lib.add_album(items)
+ album.store()
+
+ return album
+
+ # Test BeatportRelease.
+ def test_album_name_applied(self):
+ self.assertEqual(self.album.name, self.test_album['album'])
+
+ def test_catalog_number_applied(self):
+ self.assertEqual(self.album.catalog_number,
+ self.test_album['catalognum'])
+
+ def test_label_applied(self):
+ self.assertEqual(self.album.label_name, self.test_album['label'])
+
+ def test_category_applied(self):
+ self.assertEqual(self.album.category, 'Release')
+
+ def test_album_url_applied(self):
+ self.assertEqual(self.album.url,
+ 'https://beatport.com/release/charade/1742984')
+
+ # Test BeatportTrack.
+ def test_title_applied(self):
+ for track, test_track in zip(self.tracks, self.test_tracks):
+ self.assertEqual(track.name, test_track.title)
+
+ def test_mix_name_applied(self):
+ for track, test_track in zip(self.tracks, self.test_tracks):
+ self.assertEqual(track.mix_name, test_track.mix_name)
+
+ def test_length_applied(self):
+ for track, test_track in zip(self.tracks, self.test_tracks):
+ self.assertEqual(int(track.length.total_seconds()),
+ int(test_track.length))
+
+ def test_track_url_applied(self):
+ # Specify beatport ids here because an 'item.id' is beets-internal.
+ ids = [
+ 7817567,
+ 7817568,
+ 7817569,
+ 7817570,
+ 7817571,
+ 7817572,
+ ]
+ # Concatenate with 'id' to pass strict equality test.
+ for track, test_track, id in zip(self.tracks, self.test_tracks, ids):
+ self.assertEqual(
+ track.url, 'https://beatport.com/track/' +
+ test_track.url + '/' + six.text_type(id))
+
+ def test_bpm_applied(self):
+ for track, test_track in zip(self.tracks, self.test_tracks):
+ self.assertEqual(track.bpm, test_track.bpm)
+
+ def test_initial_key_applied(self):
+ for track, test_track in zip(self.tracks, self.test_tracks):
+ self.assertEqual(track.initial_key, test_track.initial_key)
+
+ def test_genre_applied(self):
+ for track, test_track in zip(self.tracks, self.test_tracks):
+ self.assertEqual(track.genre, test_track.genre)
+
+
+class BeatportResponseEmptyTest(_common.TestCase, TestHelper):
+ def _make_tracks_response(self):
+ results = [{
+ "id": 7817567,
+ "name": "Mirage a Trois",
+ "genres": [{
+ "id": 9,
+ "name": "Breaks",
+ "slug": "breaks",
+ "type": "genre"
+ }],
+ "subGenres": [{
+ "id": 209,
+ "name": "Glitch Hop",
+ "slug": "glitch-hop",
+ "type": "subgenre"
+ }],
+ }]
+ return results
+
+ def setUp(self):
+ self.setup_beets()
+ self.load_plugins('beatport')
+ self.lib = library.Library(':memory:')
+
+ # Set up 'tracks'.
+ self.response_tracks = self._make_tracks_response()
+ self.tracks = [beatport.BeatportTrack(t) for t in self.response_tracks]
+
+ # Make alias to be congruent with class `BeatportTest`.
+ self.test_tracks = self.response_tracks
+
+ def tearDown(self):
+ self.unload_plugins()
+ self.teardown_beets()
+
+ def test_response_tracks_empty(self):
+ response_tracks = []
+ tracks = [beatport.BeatportTrack(t) for t in response_tracks]
+ self.assertEqual(tracks, [])
+
+ def test_sub_genre_empty_fallback(self):
+ """No 'sub_genre' is provided. Test if fallback to 'genre' works.
+ """
+ self.response_tracks[0]['subGenres'] = []
+ tracks = [beatport.BeatportTrack(t) for t in self.response_tracks]
+
+ self.test_tracks[0]['subGenres'] = []
+
+ self.assertEqual(tracks[0].genre,
+ self.test_tracks[0]['genres'][0]['name'])
+
+ def test_genre_empty(self):
+ """No 'genre' is provided. Test if 'sub_genre' is applied.
+ """
+ self.response_tracks[0]['genres'] = []
+ tracks = [beatport.BeatportTrack(t) for t in self.response_tracks]
+
+ self.test_tracks[0]['genres'] = []
+
+ self.assertEqual(tracks[0].genre,
+ self.test_tracks[0]['subGenres'][0]['name'])
+
+
+def suite():
+ return unittest.TestLoader().loadTestsFromName(__name__)
+
+
+if __name__ == '__main__':
+ unittest.main(defaultTest='suite')
diff --git a/test/test_dbcore.py b/test/test_dbcore.py
index c3a8a60ee..1dd2284c6 100644
--- a/test/test_dbcore.py
+++ b/test/test_dbcore.py
@@ -53,6 +53,7 @@ class ModelFixture1(dbcore.Model):
_fields = {
'id': dbcore.types.PRIMARY_ID,
'field_one': dbcore.types.INTEGER,
+ 'field_two': dbcore.types.STRING,
}
_types = {
'some_float_field': dbcore.types.FLOAT,
@@ -404,7 +405,7 @@ class ModelTest(unittest.TestCase):
def test_items(self):
model = ModelFixture1(self.db)
model.id = 5
- self.assertEqual({('id', 5), ('field_one', 0)},
+ self.assertEqual({('id', 5), ('field_one', 0), ('field_two', '')},
set(model.items()))
def test_delete_internal_field(self):
@@ -419,10 +420,28 @@ class ModelTest(unittest.TestCase):
class FormatTest(unittest.TestCase):
- def test_format_fixed_field(self):
+ def test_format_fixed_field_integer(self):
model = ModelFixture1()
- model.field_one = u'caf\xe9'
+ model.field_one = 155
value = model.formatted().get('field_one')
+ self.assertEqual(value, u'155')
+
+ def test_format_fixed_field_integer_normalized(self):
+ """The normalize method of the Integer class rounds floats
+ """
+ model = ModelFixture1()
+ model.field_one = 142.432
+ value = model.formatted().get('field_one')
+ self.assertEqual(value, u'142')
+
+ model.field_one = 142.863
+ value = model.formatted().get('field_one')
+ self.assertEqual(value, u'143')
+
+ def test_format_fixed_field_string(self):
+ model = ModelFixture1()
+ model.field_two = u'caf\xe9'
+ value = model.formatted().get('field_two')
self.assertEqual(value, u'caf\xe9')
def test_format_flex_field(self):
diff --git a/test/test_discogs.py b/test/test_discogs.py
index 8b2eff9f1..61d9d5aa1 100644
--- a/test/test_discogs.py
+++ b/test/test_discogs.py
@@ -32,7 +32,7 @@ class DGAlbumInfoTest(_common.TestCase):
those required for the tests on this class."""
data = {
'id': 'ALBUM ID',
- 'uri': 'ALBUM URI',
+ 'uri': 'https://www.discogs.com/release/release/13633721',
'title': 'ALBUM TITLE',
'year': '3001',
'artists': [{
@@ -45,6 +45,12 @@ class DGAlbumInfoTest(_common.TestCase):
'name': 'FORMAT',
'qty': 1
}],
+ 'styles': [
+ 'STYLE1', 'STYLE2'
+ ],
+ 'genres': [
+ 'GENRE1', 'GENRE2'
+ ],
'labels': [{
'name': 'LABEL NAME',
'catno': 'CATALOG NUMBER',
diff --git a/test/test_export.py b/test/test_export.py
new file mode 100644
index 000000000..779e74423
--- /dev/null
+++ b/test/test_export.py
@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+# This file is part of beets.
+# Copyright 2019, Carl Suster
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+"""Test the beets.export utilities associated with the export plugin.
+"""
+
+from __future__ import division, absolute_import, print_function
+
+import unittest
+from test.helper import TestHelper
+import re # used to test csv format
+import json
+from xml.etree.ElementTree import Element
+from xml.etree import ElementTree
+
+
+class ExportPluginTest(unittest.TestCase, TestHelper):
+ def setUp(self):
+ self.setup_beets()
+ self.load_plugins('export')
+ self.test_values = {'title': 'xtitle', 'album': 'xalbum'}
+
+ def tearDown(self):
+ self.unload_plugins()
+ self.teardown_beets()
+
+ def execute_command(self, format_type, artist):
+ query = ','.join(self.test_values.keys())
+ out = self.run_with_output(
+ 'export',
+ '-f', format_type,
+ '-i', query,
+ artist
+ )
+ return out
+
+ def create_item(self):
+ item, = self.add_item_fixtures()
+ item.artist = 'xartist'
+ item.title = self.test_values['title']
+ item.album = self.test_values['album']
+ item.write()
+ item.store()
+ return item
+
+ def test_json_output(self):
+ item1 = self.create_item()
+ out = self.execute_command(
+ format_type='json',
+ artist=item1.artist
+ )
+ json_data = json.loads(out)[0]
+ for key, val in self.test_values.items():
+ self.assertTrue(key in json_data)
+ self.assertEqual(val, json_data[key])
+
+ def test_csv_output(self):
+ item1 = self.create_item()
+ out = self.execute_command(
+ format_type='csv',
+ artist=item1.artist
+ )
+ csv_list = re.split('\r', re.sub('\n', '', out))
+ head = re.split(',', csv_list[0])
+ vals = re.split(',|\r', csv_list[1])
+ for index, column in enumerate(head):
+ self.assertTrue(self.test_values.get(column, None) is not None)
+ self.assertEqual(vals[index], self.test_values[column])
+
+ def test_xml_output(self):
+ item1 = self.create_item()
+ out = self.execute_command(
+ format_type='xml',
+ artist=item1.artist
+ )
+ library = ElementTree.fromstring(out)
+ self.assertIsInstance(library, Element)
+ for track in library[0]:
+ for details in track:
+ tag = details.tag
+ txt = details.text
+ self.assertTrue(tag in self.test_values, msg=tag)
+ self.assertEqual(self.test_values[tag], txt, msg=txt)
+
+
+def suite():
+ return unittest.TestLoader().loadTestsFromName(__name__)
+
+if __name__ == '__main__':
+ unittest.main(defaultTest='suite')
diff --git a/test/test_files.py b/test/test_files.py
index ff055ac6f..13a8b4407 100644
--- a/test/test_files.py
+++ b/test/test_files.py
@@ -102,6 +102,25 @@ class MoveTest(_common.TestCase):
self.i.move()
self.assertEqual(self.i.path, old_path)
+ def test_move_file_with_colon(self):
+ self.i.artist = u'C:DOS'
+ self.i.move()
+ self.assertIn('C_DOS', self.i.path.decode())
+
+ def test_move_file_with_multiple_colons(self):
+ print(beets.config['replace'])
+ self.i.artist = u'COM:DOS'
+ self.i.move()
+ self.assertIn('COM_DOS', self.i.path.decode())
+
+ def test_move_file_with_colon_alt_separator(self):
+ old = beets.config['drive_sep_replace']
+ beets.config["drive_sep_replace"] = '0'
+ self.i.artist = u'C:DOS'
+ self.i.move()
+ self.assertIn('C0DOS', self.i.path.decode())
+ beets.config["drive_sep_replace"] = old
+
def test_read_only_file_copied_writable(self):
# Make the source file read-only.
os.chmod(self.path, 0o444)
@@ -195,6 +214,11 @@ class HelperTest(_common.TestCase):
a = ['a', 'b', 'c']
self.assertEqual(util.components(p), a)
+ def test_forward_slash(self):
+ p = br'C:\a\b\c'
+ a = br'C:/a/b/c'
+ self.assertEqual(util.path_as_posix(p), a)
+
class AlbumFileTest(_common.TestCase):
def setUp(self):
diff --git a/test/test_hook.py b/test/test_hook.py
index 81363c73c..2a48a72b1 100644
--- a/test/test_hook.py
+++ b/test/test_hook.py
@@ -20,7 +20,7 @@ import tempfile
import unittest
from test import _common
-from test.helper import TestHelper
+from test.helper import TestHelper, capture_log
from beets import config
from beets import plugins
@@ -37,7 +37,7 @@ class HookTest(_common.TestCase, TestHelper):
TEST_HOOK_COUNT = 5
def setUp(self):
- self.setup_beets() # Converter is threaded
+ self.setup_beets()
def tearDown(self):
self.unload_plugins()
@@ -54,6 +54,38 @@ class HookTest(_common.TestCase, TestHelper):
config['hook']['hooks'] = hooks
+ def test_hook_empty_command(self):
+ self._add_hook('test_event', '')
+
+ self.load_plugins('hook')
+
+ with capture_log('beets.hook') as logs:
+ plugins.send('test_event')
+
+ self.assertIn('hook: invalid command ""', logs)
+
+ def test_hook_non_zero_exit(self):
+ self._add_hook('test_event', 'sh -c "exit 1"')
+
+ self.load_plugins('hook')
+
+ with capture_log('beets.hook') as logs:
+ plugins.send('test_event')
+
+ self.assertIn('hook: hook for test_event exited with status 1', logs)
+
+ def test_hook_non_existent_command(self):
+ self._add_hook('test_event', 'non-existent-command')
+
+ self.load_plugins('hook')
+
+ with capture_log('beets.hook') as logs:
+ plugins.send('test_event')
+
+ self.assertTrue(any(
+ message.startswith("hook: hook for test_event failed: ")
+ for message in logs))
+
def test_hook_no_arguments(self):
temporary_paths = [
get_temporary_path() for i in range(self.TEST_HOOK_COUNT)
diff --git a/test/test_importer.py b/test/test_importer.py
index 8f637a077..3418d4628 100644
--- a/test/test_importer.py
+++ b/test/test_importer.py
@@ -79,7 +79,7 @@ class AutotagStub(object):
autotag.mb.album_for_id = self.mb_album_for_id
autotag.mb.track_for_id = self.mb_track_for_id
- def match_album(self, albumartist, album, tracks):
+ def match_album(self, albumartist, album, tracks, extra_tags):
if self.matching == self.IDENT:
yield self._make_album_match(albumartist, album, tracks)
diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py
index c2b4227d7..a9ac43a27 100644
--- a/test/test_keyfinder.py
+++ b/test/test_keyfinder.py
@@ -38,7 +38,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper):
item = Item(path='/file')
item.add(self.lib)
- command_output.return_value = 'dbm'
+ command_output.return_value = util.CommandOutput(b"dbm", b"")
self.run_command('keyfinder')
item.load()
@@ -47,7 +47,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper):
['KeyFinder', '-f', util.syspath(item.path)])
def test_add_key_on_import(self, command_output):
- command_output.return_value = 'dbm'
+ command_output.return_value = util.CommandOutput(b"dbm", b"")
importer = self.create_importer()
importer.run()
@@ -60,7 +60,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper):
item = Item(path='/file', initial_key='F')
item.add(self.lib)
- command_output.return_value = 'C#m'
+ command_output.return_value = util.CommandOutput(b"C#m", b"")
self.run_command('keyfinder')
item.load()
@@ -70,7 +70,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper):
item = Item(path='/file', initial_key='F')
item.add(self.lib)
- command_output.return_value = 'dbm'
+ command_output.return_value = util.CommandOutput(b"dbm", b"")
self.run_command('keyfinder')
item.load()
diff --git a/test/test_lyrics.py b/test/test_lyrics.py
index f7ea538e2..11006348e 100644
--- a/test/test_lyrics.py
+++ b/test/test_lyrics.py
@@ -17,28 +17,28 @@
from __future__ import absolute_import, division, print_function
+import itertools
+from io import open
import os
import re
import six
import sys
import unittest
-from mock import patch
-from test import _common
+import confuse
+from mock import MagicMock, patch
from beets import logging
from beets.library import Item
from beets.util import bytestring_path
-import confuse
-
from beetsplug import lyrics
-
-from mock import MagicMock
+from test import _common
log = logging.getLogger('beets.test_lyrics')
raw_backend = lyrics.Backend({}, log)
google = lyrics.Google(MagicMock(), log)
+genius = lyrics.Genius(MagicMock(), log)
class LyricsPluginTest(unittest.TestCase):
@@ -94,6 +94,27 @@ class LyricsPluginTest(unittest.TestCase):
self.assertEqual(('Alice and Bob', ['song']),
list(lyrics.search_pairs(item))[0])
+ def test_search_artist_sort(self):
+ item = Item(artist='CHVRCHΞS', title='song', artist_sort='CHVRCHES')
+ self.assertIn(('CHVRCHΞS', ['song']),
+ lyrics.search_pairs(item))
+ self.assertIn(('CHVRCHES', ['song']),
+ lyrics.search_pairs(item))
+
+ # Make sure that the original artist name is still the first entry
+ self.assertEqual(('CHVRCHΞS', ['song']),
+ list(lyrics.search_pairs(item))[0])
+
+ item = Item(artist='横山克', title='song', artist_sort='Masaru Yokoyama')
+ self.assertIn(('横山克', ['song']),
+ lyrics.search_pairs(item))
+ self.assertIn(('Masaru Yokoyama', ['song']),
+ lyrics.search_pairs(item))
+
+ # Make sure that the original artist name is still the first entry
+ self.assertEqual(('横山克', ['song']),
+ list(lyrics.search_pairs(item))[0])
+
def test_search_pairs_multi_titles(self):
item = Item(title='1 / 2', artist='A')
self.assertIn(('A', ['1 / 2']), lyrics.search_pairs(item))
@@ -209,7 +230,7 @@ class MockFetchUrl(object):
def __call__(self, url, filename=None):
self.fetched = url
fn = url_to_filename(url)
- with open(fn, 'r') as f:
+ with open(fn, 'r', encoding="utf8") as f:
content = f.read()
return content
@@ -248,8 +269,8 @@ class LyricsPluginSourcesTest(LyricsGoogleBaseTest):
DEFAULT_SOURCES = [
dict(DEFAULT_SONG, backend=lyrics.LyricsWiki),
- dict(artist=u'Santana', title=u'Black magic woman',
- backend=lyrics.MusiXmatch),
+ # dict(artist=u'Santana', title=u'Black magic woman',
+ # backend=lyrics.MusiXmatch),
dict(DEFAULT_SONG, backend=lyrics.Genius),
]
@@ -263,9 +284,9 @@ class LyricsPluginSourcesTest(LyricsGoogleBaseTest):
dict(DEFAULT_SONG,
url=u'http://www.chartlyrics.com',
path=u'/_LsLsZ7P4EK-F-LD4dJgDQ/Lady+Madonna.aspx'),
- dict(DEFAULT_SONG,
- url=u'http://www.elyricsworld.com',
- path=u'/lady_madonna_lyrics_beatles.html'),
+ # dict(DEFAULT_SONG,
+ # url=u'http://www.elyricsworld.com',
+ # path=u'/lady_madonna_lyrics_beatles.html'),
dict(url=u'http://www.lacoccinelle.net',
artist=u'Jacques Brel', title=u"Amsterdam",
path=u'/paroles-officielles/275679.html'),
@@ -282,11 +303,11 @@ class LyricsPluginSourcesTest(LyricsGoogleBaseTest):
dict(url=u'http://www.lyricsontop.com',
artist=u'Amy Winehouse', title=u"Jazz'n'blues",
path=u'/amy-winehouse-songs/jazz-n-blues-lyrics.html'),
- dict(DEFAULT_SONG,
- url='http://www.metrolyrics.com/',
- path='lady-madonna-lyrics-beatles.html'),
- dict(url='http://www.musica.com/', path='letras.asp?letra=2738',
- artist=u'Santana', title=u'Black magic woman'),
+ # dict(DEFAULT_SONG,
+ # url='http://www.metrolyrics.com/',
+ # path='lady-madonna-lyrics-beatles.html'),
+ # dict(url='http://www.musica.com/', path='letras.asp?letra=2738',
+ # artist=u'Santana', title=u'Black magic woman'),
dict(url=u'http://www.paroles.net/',
artist=u'Lilly Wood & the prick', title=u"Hey it's ok",
path=u'lilly-wood-the-prick/paroles-hey-it-s-ok'),
@@ -302,9 +323,9 @@ class LyricsPluginSourcesTest(LyricsGoogleBaseTest):
LyricsGoogleBaseTest.setUp(self)
self.plugin = lyrics.LyricsPlugin()
- @unittest.skipUnless(os.environ.get(
- 'BEETS_TEST_LYRICS_SOURCES', '0') == '1',
- 'lyrics sources testing not enabled')
+ @unittest.skipUnless(
+ os.environ.get('INTEGRATION_TEST', '0') == '1',
+ 'integration testing not enabled')
def test_backend_sources_ok(self):
"""Test default backends with songs known to exist in respective databases.
"""
@@ -316,9 +337,9 @@ class LyricsPluginSourcesTest(LyricsGoogleBaseTest):
errors.append(s['backend'].__name__)
self.assertFalse(errors)
- @unittest.skipUnless(os.environ.get(
- 'BEETS_TEST_LYRICS_SOURCES', '0') == '1',
- 'lyrics sources testing not enabled')
+ @unittest.skipUnless(
+ os.environ.get('INTEGRATION_TEST', '0') == '1',
+ 'integration testing not enabled')
def test_google_sources_ok(self):
"""Test if lyrics present on websites registered in beets google custom
search engine are correctly scraped.
@@ -395,24 +416,133 @@ class LyricsGooglePluginMachineryTest(LyricsGoogleBaseTest):
google.is_page_candidate(url, url_title, s['title'], u'Sunn O)))')
+# test Genius backend
+
+class GeniusBaseTest(unittest.TestCase):
+ def setUp(self):
+ """Set up configuration."""
+ try:
+ __import__('bs4')
+ except ImportError:
+ self.skipTest('Beautiful Soup 4 not available')
+ if sys.version_info[:3] < (2, 7, 3):
+ self.skipTest("Python's built-in HTML parser is not good enough")
+
+
+class GeniusScrapeLyricsFromHtmlTest(GeniusBaseTest):
+ """tests Genius._scrape_lyrics_from_html()"""
+
+ def setUp(self):
+ """Set up configuration"""
+ GeniusBaseTest.setUp(self)
+ self.plugin = lyrics.LyricsPlugin()
+
+ def test_no_lyrics_div(self):
+ """Ensure we don't crash when the scraping the html for a genius page
+ doesn't contain
+ """
+ # https://github.com/beetbox/beets/issues/3535
+ # expected return value None
+ url = 'https://genius.com/sample'
+ mock = MockFetchUrl()
+ self.assertEqual(genius._scrape_lyrics_from_html(mock(url)), None)
+
+ def test_good_lyrics(self):
+ """Ensure we are able to scrape a page with lyrics"""
+ url = 'https://genius.com/Wu-tang-clan-cream-lyrics'
+ mock = MockFetchUrl()
+ self.assertIsNotNone(genius._scrape_lyrics_from_html(mock(url)))
+
+ # TODO: find an example of a lyrics page with multiple divs and test it
+
+
+class GeniusFetchTest(GeniusBaseTest):
+ """tests Genius.fetch()"""
+
+ def setUp(self):
+ """Set up configuration"""
+ GeniusBaseTest.setUp(self)
+ self.plugin = lyrics.LyricsPlugin()
+
+ @patch.object(lyrics.Genius, '_scrape_lyrics_from_html')
+ @patch.object(lyrics.Backend, 'fetch_url', return_value=True)
+ def test_json(self, mock_fetch_url, mock_scrape):
+ """Ensure we're finding artist matches"""
+ with patch.object(
+ lyrics.Genius, '_search', return_value={
+ "response": {
+ "hits": [
+ {
+ "result": {
+ "primary_artist": {
+ "name": u"\u200Bblackbear",
+ },
+ "url": "blackbear_url"
+ }
+ },
+ {
+ "result": {
+ "primary_artist": {
+ "name": u"El\u002Dp"
+ },
+ "url": "El-p_url"
+ }
+ }
+ ]
+ }
+ }
+ ) as mock_json:
+ # genius uses zero-width-spaces (\u200B) for lowercase
+ # artists so we make sure we can match those
+ self.assertIsNotNone(genius.fetch('blackbear', 'Idfc'))
+ mock_fetch_url.assert_called_once_with("blackbear_url")
+ mock_scrape.assert_called_once_with(True)
+
+ # genius uses the hypen minus (\u002D) as their dash
+ self.assertIsNotNone(genius.fetch('El-p', 'Idfc'))
+ mock_fetch_url.assert_called_with('El-p_url')
+ mock_scrape.assert_called_with(True)
+
+ # test no matching artist
+ self.assertIsNone(genius.fetch('doesntexist', 'none'))
+
+ # test invalid json
+ mock_json.return_value = None
+ self.assertIsNone(genius.fetch('blackbear', 'Idfc'))
+
+ # TODO: add integration test hitting real api
+
+
+# test utilties
+
class SlugTests(unittest.TestCase):
def test_slug(self):
# plain ascii passthrough
text = u"test"
self.assertEqual(lyrics.slug(text), 'test')
+
# german unicode and capitals
text = u"Mørdag"
self.assertEqual(lyrics.slug(text), 'mordag')
+
# more accents and quotes
text = u"l'été c'est fait pour jouer"
self.assertEqual(lyrics.slug(text), 'l-ete-c-est-fait-pour-jouer')
+
# accents, parens and spaces
text = u"\xe7afe au lait (boisson)"
self.assertEqual(lyrics.slug(text), 'cafe-au-lait-boisson')
text = u"Multiple spaces -- and symbols! -- merged"
self.assertEqual(lyrics.slug(text),
'multiple-spaces-and-symbols-merged')
+ text = u"\u200Bno-width-space"
+ self.assertEqual(lyrics.slug(text), 'no-width-space')
+
+ # variations of dashes should get standardized
+ dashes = [u'\u200D', u'\u2010']
+ for dash1, dash2 in itertools.combinations(dashes, 2):
+ self.assertEqual(lyrics.slug(dash1), lyrics.slug(dash2))
def suite():
diff --git a/test/test_mb.py b/test/test_mb.py
index d5cb7c468..de1ffd9a7 100644
--- a/test/test_mb.py
+++ b/test/test_mb.py
@@ -459,7 +459,7 @@ class ParseIDTest(_common.TestCase):
def test_parse_id_url_finds_id(self):
id_string = "28e32c71-1450-463e-92bf-e0a46446fc11"
- id_url = "http://musicbrainz.org/entity/%s" % id_string
+ id_url = "https://musicbrainz.org/entity/%s" % id_string
out = mb._parse_id(id_url)
self.assertEqual(out, id_string)
diff --git a/test/test_parentwork.py b/test/test_parentwork.py
new file mode 100644
index 000000000..df6a98d79
--- /dev/null
+++ b/test/test_parentwork.py
@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+# This file is part of beets.
+# Copyright 2017, Dorian Soergel
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+"""Tests for the 'parentwork' plugin."""
+
+from __future__ import division, absolute_import, print_function
+
+import os
+import unittest
+from test.helper import TestHelper
+
+from beets.library import Item
+from beetsplug import parentwork
+
+
+class ParentWorkTest(unittest.TestCase, TestHelper):
+ def setUp(self):
+ """Set up configuration"""
+ self.setup_beets()
+ self.load_plugins('parentwork')
+
+ def tearDown(self):
+ self.unload_plugins()
+ self.teardown_beets()
+
+ @unittest.skipUnless(
+ os.environ.get('INTEGRATION_TEST', '0') == '1',
+ 'integration testing not enabled')
+ def test_normal_case(self):
+ item = Item(path='/file',
+ mb_workid=u'e27bda6e-531e-36d3-9cd7-b8ebc18e8c53')
+ item.add(self.lib)
+
+ self.run_command('parentwork')
+
+ item.load()
+ self.assertEqual(item['mb_parentworkid'],
+ u'32c8943f-1b27-3a23-8660-4567f4847c94')
+
+ @unittest.skipUnless(
+ os.environ.get('INTEGRATION_TEST', '0') == '1',
+ 'integration testing not enabled')
+ def test_force(self):
+ self.config['parentwork']['force'] = True
+ item = Item(path='/file',
+ mb_workid=u'e27bda6e-531e-36d3-9cd7-b8ebc18e8c53',
+ mb_parentworkid=u'XXX')
+ item.add(self.lib)
+
+ self.run_command('parentwork')
+
+ item.load()
+ self.assertEqual(item['mb_parentworkid'],
+ u'32c8943f-1b27-3a23-8660-4567f4847c94')
+
+ @unittest.skipUnless(
+ os.environ.get('INTEGRATION_TEST', '0') == '1',
+ 'integration testing not enabled')
+ def test_no_force(self):
+ self.config['parentwork']['force'] = True
+ item = Item(path='/file', mb_workid=u'e27bda6e-531e-36d3-9cd7-\
+ b8ebc18e8c53', mb_parentworkid=u'XXX')
+ item.add(self.lib)
+
+ self.run_command('parentwork')
+
+ item.load()
+ self.assertEqual(item['mb_parentworkid'], u'XXX')
+
+ # test different cases, still with Matthew Passion Ouverture or Mozart
+ # requiem
+
+ @unittest.skipUnless(
+ os.environ.get('INTEGRATION_TEST', '0') == '1',
+ 'integration testing not enabled')
+ def test_direct_parent_work(self):
+ mb_workid = u'2e4a3668-458d-3b2a-8be2-0b08e0d8243a'
+ self.assertEqual(u'f04b42df-7251-4d86-a5ee-67cfa49580d1',
+ parentwork.direct_parent_id(mb_workid)[0])
+ self.assertEqual(u'45afb3b2-18ac-4187-bc72-beb1b1c194ba',
+ parentwork.work_parent_id(mb_workid)[0])
+
+
+def suite():
+ return unittest.TestLoader().loadTestsFromName(__name__)
+
+
+if __name__ == '__main__':
+ unittest.main(defaultTest='suite')
diff --git a/test/test_player.py b/test/test_player.py
index 959d77eb3..dd47ac62b 100644
--- a/test/test_player.py
+++ b/test/test_player.py
@@ -29,9 +29,8 @@ import time
import yaml
import tempfile
from contextlib import contextmanager
-import random
-from beets.util import py3_path
+from beets.util import py3_path, bluelet
from beetsplug import bpd
import confuse
@@ -231,11 +230,6 @@ class MPCClient(object):
return line
-def start_beets(*args):
- import beets.ui
- beets.ui.main(list(args))
-
-
def implements(commands, expectedFailure=False): # noqa: N803
def _test(self):
with self.run_bpd() as client:
@@ -246,6 +240,29 @@ def implements(commands, expectedFailure=False): # noqa: N803
return unittest.expectedFailure(_test) if expectedFailure else _test
+bluelet_listener = bluelet.Listener
+
+
+@mock.patch("beets.util.bluelet.Listener")
+def start_server(args, assigned_port, listener_patch):
+ """Start the bpd server, writing the port to `assigned_port`.
+ """
+ def listener_wrap(host, port):
+ """Wrap `bluelet.Listener`, writing the port to `assigend_port`.
+ """
+ # `bluelet.Listener` has previously been saved to
+ # `bluelet_listener` as this function will replace it at its
+ # original location.
+ listener = bluelet_listener(host, port)
+ # read port assigned by OS
+ assigned_port.put_nowait(listener.sock.getsockname()[1])
+ return listener
+ listener_patch.side_effect = listener_wrap
+
+ import beets.ui
+ beets.ui.main(args)
+
+
class BPDTestHelper(unittest.TestCase, TestHelper):
def setUp(self):
self.setup_beets(disk=True)
@@ -263,22 +280,18 @@ class BPDTestHelper(unittest.TestCase, TestHelper):
self.unload_plugins()
@contextmanager
- def run_bpd(self, host='localhost', port=None, password=None,
- do_hello=True, second_client=False):
+ def run_bpd(self, host='localhost', password=None, do_hello=True,
+ second_client=False):
""" Runs BPD in another process, configured with the same library
database as we created in the setUp method. Exposes a client that is
connected to the server, and kills the server at the end.
"""
- # Choose a port (randomly) to avoid conflicts between parallel
- # tests.
- if not port:
- port = 9876 + random.randint(0, 10000)
-
# Create a config file:
config = {
'pluginpath': [py3_path(self.temp_dir)],
'plugins': 'bpd',
- 'bpd': {'host': host, 'port': port, 'control_port': port + 1},
+ # use port 0 to let the OS choose a free port
+ 'bpd': {'host': host, 'port': 0, 'control_port': 0},
}
if password:
config['bpd']['password'] = password
@@ -290,38 +303,39 @@ class BPDTestHelper(unittest.TestCase, TestHelper):
config_file.close()
# Fork and launch BPD in the new process:
- args = (
+ assigned_port = mp.Queue(2) # 2 slots, `control_port` and `port`
+ server = mp.Process(target=start_server, args=([
'--library', self.config['library'].as_filename(),
'--directory', py3_path(self.libdir),
'--config', py3_path(config_file.name),
'bpd'
- )
- server = mp.Process(target=start_beets, args=args)
+ ], assigned_port))
server.start()
- # Wait until the socket is connected:
- sock, sock2 = None, None
- for _ in range(20):
- sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- if sock.connect_ex((host, port)) == 0:
- break
- else:
- sock.close()
- time.sleep(0.01)
- else:
- raise RuntimeError('Timed out waiting for the BPD server')
-
try:
- if second_client:
- sock2 = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- sock2.connect((host, port))
- yield MPCClient(sock, do_hello), MPCClient(sock2, do_hello)
- else:
- yield MPCClient(sock, do_hello)
+ assigned_port.get(timeout=1) # skip control_port
+ port = assigned_port.get(timeout=0.5) # read port
+
+ sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ try:
+ sock.connect((host, port))
+
+ if second_client:
+ sock2 = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ try:
+ sock2.connect((host, port))
+ yield (
+ MPCClient(sock, do_hello),
+ MPCClient(sock2, do_hello),
+ )
+ finally:
+ sock2.close()
+
+ else:
+ yield MPCClient(sock, do_hello)
+ finally:
+ sock.close()
finally:
- sock.close()
- if sock2:
- sock2.close()
server.terminate()
server.join(timeout=0.2)
diff --git a/test/test_playlist.py b/test/test_playlist.py
index edd98e711..88abb733f 100644
--- a/test/test_playlist.py
+++ b/test/test_playlist.py
@@ -120,7 +120,7 @@ class PlaylistQueryTestHelper(PlaylistTestHelper):
]))
def test_name_query_with_nonexisting_playlist(self):
- q = u'playlist:nonexisting'.format(self.playlist_dir)
+ q = u'playlist:nonexisting'
results = self.lib.items(q)
self.assertEqual(set(results), set())
diff --git a/test/test_plexupdate.py b/test/test_plexupdate.py
index f8b0bdcd9..ef89892a4 100644
--- a/test/test_plexupdate.py
+++ b/test/test_plexupdate.py
@@ -93,7 +93,9 @@ class PlexUpdateTest(unittest.TestCase, TestHelper):
self.config['plex']['host'],
self.config['plex']['port'],
self.config['plex']['token'],
- self.config['plex']['library_name'].get()), '2')
+ self.config['plex']['library_name'].get(),
+ self.config['plex']['secure'],
+ self.config['plex']['ignore_cert_errors']), '2')
@responses.activate
def test_get_named_music_section(self):
@@ -104,7 +106,9 @@ class PlexUpdateTest(unittest.TestCase, TestHelper):
self.config['plex']['host'],
self.config['plex']['port'],
self.config['plex']['token'],
- 'My Music Library'), '2')
+ 'My Music Library',
+ self.config['plex']['secure'],
+ self.config['plex']['ignore_cert_errors']), '2')
@responses.activate
def test_update_plex(self):
@@ -117,7 +121,9 @@ class PlexUpdateTest(unittest.TestCase, TestHelper):
self.config['plex']['host'],
self.config['plex']['port'],
self.config['plex']['token'],
- self.config['plex']['library_name'].get()).status_code, 200)
+ self.config['plex']['library_name'].get(),
+ self.config['plex']['secure'],
+ self.config['plex']['ignore_cert_errors']).status_code, 200)
def suite():
diff --git a/test/test_query.py b/test/test_query.py
index 56134da7b..4017ff44b 100644
--- a/test/test_query.py
+++ b/test/test_query.py
@@ -783,6 +783,21 @@ class NoneQueryTest(unittest.TestCase, TestHelper):
matched = self.lib.items(NoneQuery(u'rg_track_gain'))
self.assertInResult(item, matched)
+ def test_match_slow(self):
+ item = self.add_item()
+ matched = self.lib.items(NoneQuery(u'rg_track_peak', fast=False))
+ self.assertInResult(item, matched)
+
+ def test_match_slow_after_set_none(self):
+ item = self.add_item(rg_track_gain=0)
+ matched = self.lib.items(NoneQuery(u'rg_track_gain', fast=False))
+ self.assertNotInResult(item, matched)
+
+ item['rg_track_gain'] = None
+ item.store()
+ matched = self.lib.items(NoneQuery(u'rg_track_gain', fast=False))
+ self.assertInResult(item, matched)
+
class NotQueryMatchTest(_common.TestCase):
"""Test `query.NotQuery` matching against a single item, using the same
diff --git a/test/test_replaygain.py b/test/test_replaygain.py
index 9f14374cc..969f5c230 100644
--- a/test/test_replaygain.py
+++ b/test/test_replaygain.py
@@ -23,6 +23,7 @@ from mock import patch
from test.helper import TestHelper, capture_log, has_program
from beets import config
+from beets.util import CommandOutput
from mediafile import MediaFile
from beetsplug.replaygain import (FatalGstreamerPluginReplayGainError,
GStreamerBackend)
@@ -39,11 +40,13 @@ if any(has_program(cmd, ['-v']) for cmd in ['mp3gain', 'aacgain']):
else:
GAIN_PROG_AVAILABLE = False
-if has_program('bs1770gain', ['--replaygain']):
+if has_program('bs1770gain'):
LOUDNESS_PROG_AVAILABLE = True
else:
LOUDNESS_PROG_AVAILABLE = False
+FFMPEG_AVAILABLE = has_program('ffmpeg', ['-version'])
+
def reset_replaygain(item):
item['rg_track_peak'] = None
@@ -84,6 +87,16 @@ class ReplayGainCliTestBase(TestHelper):
self.teardown_beets()
self.unload_plugins()
+ def _reset_replaygain(self, item):
+ item['rg_track_peak'] = None
+ item['rg_track_gain'] = None
+ item['rg_album_peak'] = None
+ item['rg_album_gain'] = None
+ item['r128_track_gain'] = None
+ item['r128_album_gain'] = None
+ item.write()
+ item.store()
+
def test_cli_saves_track_gain(self):
for item in self.lib.items():
self.assertIsNone(item.rg_track_peak)
@@ -138,7 +151,48 @@ class ReplayGainCliTestBase(TestHelper):
self.assertEqual(max(gains), min(gains))
self.assertNotEqual(max(gains), 0.0)
- self.assertNotEqual(max(peaks), 0.0)
+ if not self.backend == "bs1770gain":
+ # Actually produces peaks == 0.0 ~ self.add_album_fixture
+ self.assertNotEqual(max(peaks), 0.0)
+
+ def test_cli_writes_only_r128_tags(self):
+ if self.backend == "command":
+ # opus not supported by command backend
+ return
+
+ album = self.add_album_fixture(2, ext="opus")
+ for item in album.items():
+ self._reset_replaygain(item)
+
+ self.run_command(u'replaygain', u'-a')
+
+ for item in album.items():
+ mediafile = MediaFile(item.path)
+ # does not write REPLAYGAIN_* tags
+ self.assertIsNone(mediafile.rg_track_gain)
+ self.assertIsNone(mediafile.rg_album_gain)
+ # writes R128_* tags
+ self.assertIsNotNone(mediafile.r128_track_gain)
+ self.assertIsNotNone(mediafile.r128_album_gain)
+
+ def test_target_level_has_effect(self):
+ item = self.lib.items()[0]
+
+ def analyse(target_level):
+ self.config['replaygain']['targetlevel'] = target_level
+ self._reset_replaygain(item)
+ self.run_command(u'replaygain', '-f')
+ mediafile = MediaFile(item.path)
+ return mediafile.rg_track_gain
+
+ gain_relative_to_84 = analyse(84)
+ gain_relative_to_89 = analyse(89)
+
+ # check that second calculation did work
+ if gain_relative_to_84 is not None:
+ self.assertIsNotNone(gain_relative_to_89)
+
+ self.assertNotEqual(gain_relative_to_84, gain_relative_to_89)
@unittest.skipIf(not GST_AVAILABLE, u'gstreamer cannot be found')
@@ -169,7 +223,6 @@ class ReplayGainLdnsCliTest(ReplayGainCliTestBase, unittest.TestCase):
class ReplayGainLdnsCliMalformedTest(TestHelper, unittest.TestCase):
-
@patch('beetsplug.replaygain.call')
def setUp(self, call_patch):
self.setup_beets()
@@ -177,23 +230,38 @@ class ReplayGainLdnsCliMalformedTest(TestHelper, unittest.TestCase):
# Patch call to return nothing, bypassing the bs1770gain installation
# check.
- call_patch.return_value = None
- self.load_plugins('replaygain')
+ call_patch.return_value = CommandOutput(
+ stdout=b'bs1770gain 0.0.0, ', stderr=b''
+ )
+ try:
+ self.load_plugins('replaygain')
+ except Exception:
+ import sys
+ exc_info = sys.exc_info()
+ try:
+ self.tearDown()
+ except Exception:
+ pass
+ six.reraise(exc_info[1], None, exc_info[2])
for item in self.add_album_fixture(2).items():
reset_replaygain(item)
+ def tearDown(self):
+ self.teardown_beets()
+ self.unload_plugins()
+
@patch('beetsplug.replaygain.call')
def test_malformed_output(self, call_patch):
# Return malformed XML (the ampersand should be &)
- call_patch.return_value = """
+ call_patch.return_value = CommandOutput(stdout=b"""
- """
+ """, stderr="")
with capture_log('beets.replaygain') as logs:
self.run_command('replaygain')
@@ -205,6 +273,11 @@ class ReplayGainLdnsCliMalformedTest(TestHelper, unittest.TestCase):
self.assertEqual(len(matching), 2)
+@unittest.skipIf(not FFMPEG_AVAILABLE, u'ffmpeg cannot be found')
+class ReplayGainFfmpegTest(ReplayGainCliTestBase, unittest.TestCase):
+ backend = u'ffmpeg'
+
+
def suite():
return unittest.TestLoader().loadTestsFromName(__name__)
diff --git a/test/test_subsonic.py b/test/test_subsonic.py
new file mode 100644
index 000000000..6d37cdf4f
--- /dev/null
+++ b/test/test_subsonic.py
@@ -0,0 +1,111 @@
+# -*- coding: utf-8 -*-
+
+"""Tests for the 'subsonic' plugin"""
+
+from __future__ import division, absolute_import, print_function
+
+import requests
+import responses
+import unittest
+
+from test import _common
+from beets import config
+from beetsplug import subsonicupdate
+from test.helper import TestHelper
+from six.moves.urllib.parse import parse_qs, urlparse
+
+
+class ArgumentsMock(object):
+ def __init__(self, mode, show_failures):
+ self.mode = mode
+ self.show_failures = show_failures
+ self.verbose = 1
+
+
+def _params(url):
+ """Get the query parameters from a URL."""
+ return parse_qs(urlparse(url).query)
+
+
+class SubsonicPluginTest(_common.TestCase, TestHelper):
+ @responses.activate
+ def setUp(self):
+ config.clear()
+ self.setup_beets()
+
+ config["subsonic"]["user"] = "admin"
+ config["subsonic"]["pass"] = "admin"
+ config["subsonic"]["url"] = "http://localhost:4040"
+
+ self.subsonicupdate = subsonicupdate.SubsonicUpdate()
+
+ def tearDown(self):
+ self.teardown_beets()
+
+ @responses.activate
+ def test_start_scan(self):
+ responses.add(
+ responses.POST,
+ 'http://localhost:4040/rest/startScan',
+ status=200
+ )
+
+ self.subsonicupdate.start_scan()
+
+ @responses.activate
+ def test_url_with_extra_forward_slash_url(self):
+ config["subsonic"]["url"] = "http://localhost:4040/contextPath"
+
+ responses.add(
+ responses.POST,
+ 'http://localhost:4040/contextPath/rest/startScan',
+ status=200
+ )
+
+ self.subsonicupdate.start_scan()
+
+ @responses.activate
+ def test_url_with_context_path(self):
+ config["subsonic"]["url"] = "http://localhost:4040/"
+
+ responses.add(
+ responses.POST,
+ 'http://localhost:4040/rest/startScan',
+ status=200
+ )
+
+ self.subsonicupdate.start_scan()
+
+ @responses.activate
+ def test_url_with_missing_port(self):
+ config["subsonic"]["url"] = "http://localhost/airsonic"
+
+ responses.add(
+ responses.POST,
+ 'http://localhost:4040/rest/startScan',
+ status=200
+ )
+
+ with self.assertRaises(requests.exceptions.ConnectionError):
+ self.subsonicupdate.start_scan()
+
+ @responses.activate
+ def test_url_with_missing_schema(self):
+ config["subsonic"]["url"] = "localhost:4040/airsonic"
+
+ responses.add(
+ responses.POST,
+ 'http://localhost:4040/rest/startScan',
+ status=200
+ )
+
+ with self.assertRaises(requests.exceptions.InvalidSchema):
+ self.subsonicupdate.start_scan()
+
+
+def suite():
+ return unittest.TestLoader().loadTestsFromName(__name__)
+
+
+if __name__ == '__main__':
+ unittest.main(defaultTest='suite')
diff --git a/test/test_thumbnails.py b/test/test_thumbnails.py
index dc03f06f7..dbbc032f7 100644
--- a/test/test_thumbnails.py
+++ b/test/test_thumbnails.py
@@ -284,6 +284,15 @@ class ThumbnailsTest(unittest.TestCase, TestHelper):
u'file:///music/%EC%8B%B8%EC%9D%B4')
+class TestPathlibURI():
+ """Test PathlibURI class"""
+ def test_uri(self):
+ test_uri = PathlibURI()
+
+ # test it won't break if we pass it bytes for a path
+ test_uri.uri(b'/')
+
+
def suite():
return unittest.TestLoader().loadTestsFromName(__name__)
diff --git a/test/test_ui.py b/test/test_ui.py
index 110e80782..b1e7e8fad 100644
--- a/test/test_ui.py
+++ b/test/test_ui.py
@@ -22,7 +22,6 @@ import shutil
import re
import subprocess
import platform
-from copy import deepcopy
import six
import unittest
@@ -1051,8 +1050,10 @@ class ShowChangeTest(_common.TestCase):
self.items[0].track = 1
self.items[0].path = b'/path/to/file.mp3'
self.info = autotag.AlbumInfo(
- u'the album', u'album id', u'the artist', u'artist id', [
- autotag.TrackInfo(u'the title', u'track id', index=1)
+ album=u'the album', album_id=u'album id', artist=u'the artist',
+ artist_id=u'artist id', tracks=[
+ autotag.TrackInfo(title=u'the title', track_id=u'track id',
+ index=1)
]
)
@@ -1136,7 +1137,9 @@ class SummarizeItemsTest(_common.TestCase):
summary = commands.summarize_items([self.item], False)
self.assertEqual(summary, u"1 items, F, 4kbps, 10:54, 987.0 B")
- i2 = deepcopy(self.item)
+ # make a copy of self.item
+ i2 = self.item.copy()
+
summary = commands.summarize_items([self.item, i2], False)
self.assertEqual(summary, u"2 items, F, 4kbps, 21:48, 1.9 KiB")
diff --git a/tox.ini b/tox.ini
index 8736f0f3c..e3476db1c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,56 +4,30 @@
# and then run "tox" from this directory.
[tox]
-envlist = py27-test, py37-test, py27-flake8, docs
-
-# The exhaustive list of environments is:
-# envlist = py{27,34,35}-{test,cov}, py{27,34,35}-flake8, docs
+envlist = py27-test, py38-{cov,lint}, docs
[_test]
-deps =
- beautifulsoup4
- flask
- mock
- nose
- nose-show-skipped
- pylast
- rarfile
- responses>=0.3.0
- pyxdg
- jellyfish
- python-mpd2
- coverage
- discogs-client
+deps = .[test]
-[_flake8]
-deps =
- flake8
- flake8-coding
- flake8-future-import
- flake8-blind-except
- pep8-naming~=0.7.0
+[_lint]
+deps = .[lint]
files = beets beetsplug beet test setup.py docs
[testenv]
-passenv =
- NOSE_SHOW_SKIPPED # Undocumented feature of nose-show-skipped.
deps =
{test,cov}: {[_test]deps}
- py27: pathlib
- py{27,34,35,36,37,38}-flake8: {[_flake8]deps}
+ lint: {[_lint]deps}
commands =
- py27-cov: python -m nose --with-coverage {posargs}
- py27-test: python -m nose {posargs}
- py3{4,5,6,7,8}-cov: python -bb -m nose --with-coverage {posargs}
- py3{4,5,6,7,8}-test: python -bb -m nose {posargs}
- py27-flake8: flake8 --min-version 2.7 {posargs} {[_flake8]files}
- py34-flake8: flake8 --min-version 3.4 {posargs} {[_flake8]files}
- py35-flake8: flake8 --min-version 3.5 {posargs} {[_flake8]files}
- py36-flake8: flake8 --min-version 3.6 {posargs} {[_flake8]files}
- py37-flake8: flake8 --min-version 3.7 {posargs} {[_flake8]files}
- py38-flake8: flake8 --min-version 3.8 {posargs} {[_flake8]files}
+ test: python -bb -m pytest {posargs}
+ cov: coverage run -m pytest {posargs}
+ lint: python -m flake8 {posargs} {[_lint]files}
[testenv:docs]
basepython = python2.7
deps = sphinx
commands = sphinx-build -W -q -b html docs {envtmpdir}/html {posargs}
+
+[testenv:int]
+deps = {[_test]deps}
+setenv = INTEGRATION_TEST = 1
+commands = python -bb -m pytest {posargs}
\ No newline at end of file