[SCM] morituri/master: add another test to fix
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Oct 19 20:10:09 UTC 2014
The following commit has been merged in the master branch:
commit 7533b269fc8f530f187fdc0472df9e7bab4e95bc
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Tue Jul 30 12:47:00 2013 +0200
add another test to fix
diff --git a/morituri/test/Makefile.am b/morituri/test/Makefile.am
index d5ac917..1b5b8d4 100644
--- a/morituri/test/Makefile.am
+++ b/morituri/test/Makefile.am
@@ -39,6 +39,7 @@ EXTRA_DIST = \
release.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml \
morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json \
morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json \
+ morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json \
kanye.cue \
kings-separate.cue \
kings-single.cue \
diff --git a/morituri/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json b/morituri/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json
new file mode 100644
index 0000000..e5bb887
--- /dev/null
+++ b/morituri/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json
@@ -0,0 +1 @@
+{"release": {"status": "Official", "asin": "B000CNEQ64", "label-info-list": [{"label": {"sort-name": "V2 Records International", "id": "947c12a1-cf28-4380-a695-a944ad15e387", "name": "V2 Records International"}, "catalog-number": "VVR1035822"}], "title": "Ballad of the Broken Seas", "country": "GB", "barcode": "5033197358222", "artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "medium-list": [{"disc-list": [{"id": "xAq8L4ELMW14.6wI6tt7QAcxiDI-", "sectors": "192868"}], "position": "1", "track-list": [{"recording": {"artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "length": "171613", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "id": "4fe44724-1d7e-4275-9693-b889864de750", "title": "Deus Ibi Est"}, "position": "1"}, {"recording": {"artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "length": "190120", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "id": "32047729-7ad9-42ae-8d9e-c256ef9251ec", "title": "Black Mountain"}, "position": "2"}, {"recording": {"artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "length": "233880", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "id": "0c71631a-5862-4834-ae8f-257b64bca745", "title": "The False Husband"}, "position": "3"}, {"recording": {"artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "length": "162386", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "id": "afc9e785-60fd-4942-a23c-3653633f4783", "title": "Ballad of the Broken Seas"}, "position": "4"}, {"recording": {"artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "length": "160680", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "id": "048932de-992d-4b08-ab4f-b5d735ea323e", "title": "Revolver"}, "position": "5"}, {"recording": {"artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "length": "209066", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "id": "42c0e096-6c48-43cf-b6d4-700903727418", "title": "Ramblin' Man"}, "position": "6"}, {"recording": {"artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "length": "207133", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "id": "ef599a4c-8163-4829-9332-8dfe8c79219a", "title": "(Do You Wanna) Come Walk With Me?"}, "position": "7"}, {"recording": {"artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "length": "277186", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "id": "765fc7cc-2055-4066-a5b2-f1afbd1fd1f8", "title": "Saturday's Gone"}, "position": "8"}, {"recording": {"artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "length": "173640", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "id": "61ac7fad-d396-4467-93a9-a25472561008", "title": "It's Hard to Kill a Bad Thing"}, "position": "9"}, {"recording": {"artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "length": "224173", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "id": "2fed65ae-3297-40d6-8f54-0d55f8ed7287", "title": "Honey Child What Can I Do?"}, "position": "10"}, {"recording": {"artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "length": "224560", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "id": "33ce6721-b148-45ad-9a1e-1a4b1ea6912e", "title": "Dusty Wreath"}, "position": "11"}, {"recording": {"artist-credit": [{"artist": {"sort-name": "Campbell, Isobel", "id": "d51f3a15-12a2-41a0-acfa-33b5eae71164", "name": "Isobel Campbell"}}, " & ", {"artist": {"sort-name": "Lanegan, Mark", "id": "a9126556-f555-4920-9617-6e013f8228a7", "name": "Mark Lanegan"}}], "length": "335133", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "id": "6cdb184d-12a0-4ba8-b50b-3325e0664f9e", "title": "The Circus Is Leaving Town"}, "position": "12"}], "format": "CD"}], "text-representation": {"language": "eng", "script": "Latn"}, "date": "2006-01-30", "artist-credit-phrase": "Isobel Campbell & Mark Lanegan", "quality": "normal", "id": "e32ae79a-336e-4d33-945c-8c5e8206dbd3"}}
\ No newline at end of file
diff --git a/morituri/test/test_common_mbngs.py b/morituri/test/test_common_mbngs.py
index f18f3fa..964049d 100644
--- a/morituri/test/test_common_mbngs.py
+++ b/morituri/test/test_common_mbngs.py
@@ -49,3 +49,29 @@ class MetadataTestCase(unittest.TestCase):
# of track artist id's
self.assertEquals(track16.mbidArtist,
u'89ad4ac3-39f7-470e-963a-56509c546377')
+
+ def testBalladOfTheBrokenSeas(self):
+ # various artists disc
+ path = os.path.join(os.path.dirname(__file__),
+ 'morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json')
+ handle = open(path, "rb")
+ response = json.loads(handle.read())
+ handle.close()
+ discid = "xAq8L4ELMW14.6wI6tt7QAcxiDI-"
+
+ metadata = mbngs._getMetadata({}, response['release'], discid)
+
+ self.assertEquals(metadata.artist, u'Isobel Campbell & Mark Lanegan')
+ self.assertEquals(metadata.release, u'2006-01-30')
+ # FIXME: this is only Isobel
+ self.assertEquals(metadata.mbidArtist,
+ u'd51f3a15-12a2-41a0-acfa-33b5eae71164')
+
+ self.assertEquals(len(metadata.tracks), 12)
+
+ track12 = metadata.tracks[11]
+
+ self.assertEquals(track12.artist, u'Isobel Campbell & Mark Lanegan')
+ # FIXME: this is only Isobel
+ self.assertEquals(track12.mbidArtist,
+ u'd51f3a15-12a2-41a0-acfa-33b5eae71164')
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list