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

fetchart: fix more tests

Browse source
This commit is contained in:
wordofglass 2016-04-06 01:36:32 +02:00
parent bc877a6d7f
commit a4994d2bf8
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
beetsplug/fetchart.py
View file

@ -698,7 +698,7 @@ class FetchArtPlugin(plugins.BeetsPlugin, RequestMixin):
source.fetch_image(candidate, extra)
if candidate.validate(extra):
out = candidate
self._log.debug(u'using {0.LOC_STR()} image {1}'
self._log.debug(u'using {0.LOC_STR} image {1}'
.format(source, out.path))
break
if out:

17
test/test_art.py
View file

@ -58,7 +58,7 @@ class FetchImageTest(UseThePlugin):
def setUp(self):
super(FetchImageTest, self).setUp()
self.dpath = os.path.join(self.temp_dir, 'arttest')
self.source = self.plugin.RemoteArtSource(logger, self.plugin.config)
self.source = fetchart.RemoteArtSource(logger, self.plugin.config)
def test_invalid_type_returns_none(self):
self.mock_response('image/watercolour')
@ -147,25 +147,26 @@ class CombinedTest(UseThePlugin):
self.mock_response(self.AMAZON_URL)
album = _common.Bag(asin=self.ASIN)
candidate = self.plugin.art_for_album(album, None)
self.assertNotEqual(candidate.path, None)
self.assertIsNotNone(candidate)
def test_main_interface_returns_none_for_missing_asin_and_path(self):
album = _common.Bag()
candidate = self.plugin.art_for_album(album, None)
self.assertEqual(candidate.path, None)
self.assertIsNotNone(candidate)
def test_main_interface_gives_precedence_to_fs_art(self):
_common.touch(os.path.join(self.dpath, 'art.jpg'))
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, 'art.jpg'))
def test_main_interface_falls_back_to_amazon(self):
self.mock_response(self.AMAZON_URL)
album = _common.Bag(asin=self.ASIN)
candidate = self.plugin.art_for_album(album, [self.dpath])
self.assertNotEqual(candidate.path, None)
self.assertIsNotNone(candidate)
self.assertFalse(candidate.path.startswith(self.dpath))
def test_main_interface_tries_amazon_before_aao(self):
@ -185,15 +186,14 @@ class CombinedTest(UseThePlugin):
self.mock_response(self.CAA_URL)
album = _common.Bag(mb_albumid=self.MBID, asin=self.ASIN)
candidate = self.plugin.art_for_album(album, None)
self.assertNotEqual(candidate.path, None)
self.assertIsNotNone(candidate)
self.assertEqual(len(responses.calls), 1)
self.assertEqual(responses.calls[0].request.url, self.CAA_URL)
def test_local_only_does_not_access_network(self):
album = _common.Bag(mb_albumid=self.MBID, asin=self.ASIN)
candidate = self.plugin.art_for_album(album, [self.dpath],
local_only=True)
self.assertEqual(candidate.path, None)
with self.assertRaises(StopIteration):
self.plugin.art_for_album(album, local_only=True)
self.assertEqual(len(responses.calls), 0)
def test_local_only_gets_fs_image(self):
@ -201,6 +201,7 @@ class CombinedTest(UseThePlugin):
album = _common.Bag(mb_albumid=self.MBID, asin=self.ASIN)
candidate = self.plugin.art_for_album(album, [self.dpath],
local_only=True)
self.assertIsNotNone(candidate)
self.assertEqual(candidate.path, os.path.join(self.dpath, 'art.jpg'))
self.assertEqual(len(responses.calls), 0)