Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-01-30 20:13:37 +01:00
Code Issues Projects Releases Wiki Activity

Simplify test changes

Browse source 
We don't need quite so many checks now that SSL isn't conditional most of the
time.
This commit is contained in:
Adrian Sampson 2017-01-02 20:49:12 -05:00
parent f941fd42de
commit 33a8e81f08
1 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
test/test_art.py
View file

@ -67,40 +67,33 @@ class FetchImageHelper(_common.TestCase):
class FetchImageTest(FetchImageHelper, UseThePlugin):
URL = '{0}example.com/test.jpg'
URL = 'http://example.com/test.jpg'
def setUp(self):
super(FetchImageTest, self).setUp()
self.dpath = os.path.join(self.temp_dir, b'arttest')
self.source = fetchart.RemoteArtSource(logger, self.plugin.config)
self.extra = {'maxwidth': 0}
self.candidate = fetchart.Candidate(logger,
url=self.URL.format('http://'))
self.candidate = fetchart.Candidate(logger, url=self.URL)
def test_invalid_type_returns_none(self):
self.mock_response(self.URL.format('http://'), 'image/watercolour')
self.mock_response(self.URL.format('https://'), 'image/watercolour')
self.mock_response(self.URL, 'image/watercolour')
self.source.fetch_image(self.candidate, self.extra)
self.assertEqual(self.candidate.path, None)
def test_jpeg_type_returns_path(self):
self.mock_response(self.URL.format('http://'), 'image/jpeg')
self.mock_response(self.URL.format('https://'))
self.mock_response(self.URL, 'image/jpeg')
self.source.fetch_image(self.candidate, self.extra)
self.assertNotEqual(self.candidate.path, None)
def test_extension_set_by_content_type(self):
self.mock_response(self.URL.format('http://'), 'image/png')
self.mock_response(self.URL.format('https://'), 'image/png')
self.mock_response(self.URL, 'image/png')
self.source.fetch_image(self.candidate, self.extra)
self.assertEqual(os.path.splitext(self.candidate.path)[1], b'.png')
self.assertExists(self.candidate.path)
def test_does_not_rely_on_server_content_type(self):
self.mock_response(self.URL.format('http://'),
'image/jpeg', 'image/png')
self.mock_response(self.URL.format('https://'),
'image/jpeg', 'imsge/png')
self.mock_response(self.URL, 'image/jpeg', 'image/png')
self.source.fetch_image(self.candidate, self.extra)
self.assertEqual(os.path.splitext(self.candidate.path)[1], b'.png')
self.assertExists(self.candidate.path)
@ -157,9 +150,9 @@ class FSArtTest(UseThePlugin):
class CombinedTest(FetchImageHelper, UseThePlugin):
ASIN = 'xxxx'
MBID = 'releaseid'
AMAZON_URL = 'images.amazon.com/images/P/{0}.01.LZZZZZZZ.jpg' \
AMAZON_URL = 'http://images.amazon.com/images/P/{0}.01.LZZZZZZZ.jpg' \
.format(ASIN)
AAO_URL = 'www.albumart.org/index_detail.php?asin={0}' \
AAO_URL = 'http://www.albumart.org/index_detail.php?asin={0}' \
.format(ASIN)
CAA_URL = 'coverartarchive.org/release/{0}/front' \
.format(MBID)
@ -170,7 +163,7 @@ class CombinedTest(FetchImageHelper, UseThePlugin):
os.mkdir(self.dpath)
def test_main_interface_returns_amazon_art(self):
self.mock_response("http://" + self.AMAZON_URL)
self.mock_response(self.AMAZON_URL)
album = _common.Bag(asin=self.ASIN)
candidate = self.plugin.art_for_album(album, None)
self.assertIsNotNone(candidate)
@ -182,34 +175,31 @@ class CombinedTest(FetchImageHelper, UseThePlugin):
def test_main_interface_gives_precedence_to_fs_art(self):
_common.touch(os.path.join(self.dpath, b'art.jpg'))
self.mock_response("http://" + self.AMAZON_URL)
self.mock_response(self.AMAZON_URL)
album = _common.Bag(asin=self.ASIN)
candidate = self.plugin.art_for_album(album, [self.dpath])
self.assertIsNotNone(candidate)
self.assertEqual(candidate.path, os.path.join(self.dpath, b'art.jpg'))
def test_main_interface_falls_back_to_amazon(self):
self.mock_response("http://" + self.AMAZON_URL)
self.mock_response(self.AMAZON_URL)
album = _common.Bag(asin=self.ASIN)
candidate = self.plugin.art_for_album(album, [self.dpath])
self.assertIsNotNone(candidate)
self.assertFalse(candidate.path.startswith(self.dpath))
def test_main_interface_tries_amazon_before_aao(self):
self.mock_response("http://" + self.AMAZON_URL)
self.mock_response(self.AMAZON_URL)
album = _common.Bag(asin=self.ASIN)
self.plugin.art_for_album(album, [self.dpath])
self.assertEqual(len(responses.calls), 1)
self.assertEqual(responses.calls[0].request.url,
"http://" + self.AMAZON_URL)
self.assertEqual(responses.calls[0].request.url, self.AMAZON_URL)
def test_main_interface_falls_back_to_aao(self):
self.mock_response("http://" + self.AMAZON_URL,
content_type='text/html')
self.mock_response(self.AMAZON_URL, content_type='text/html')
album = _common.Bag(asin=self.ASIN)
self.plugin.art_for_album(album, [self.dpath])
self.assertEqual(responses.calls[-1].request.url,
"http://" + self.AAO_URL)
self.assertEqual(responses.calls[-1].request.url, self.AAO_URL)
def test_main_interface_uses_caa_when_mbid_available(self):
self.mock_response("http://" + self.CAA_URL)