[SCM] morituri/master: Extend patch 2001 to cover testsuite.
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Oct 19 20:09:57 UTC 2014
The following commit has been merged in the master branch:
commit 3a56baca7ee24bf8ccbb1f8dd0693681bd7a7a2d
Author: Jonas Smedegaard <dr at jones.dk>
Date: Mon Jan 28 15:23:49 2013 +0100
Extend patch 2001 to cover testsuite.
diff --git a/debian/patches/2001_use_system_musicbrainzngs.patch b/debian/patches/2001_use_system_musicbrainzngs.patch
index 8a8d899..4b93acd 100644
--- a/debian/patches/2001_use_system_musicbrainzngs.patch
+++ b/debian/patches/2001_use_system_musicbrainzngs.patch
@@ -84,3 +84,51 @@ Last-Update: 2013-01-15
program.py \
renamer.py \
task.py
+--- a/morituri/test/test_common_musicbrainzngs.py
++++ b/morituri/test/test_common_musicbrainzngs.py
+@@ -6,7 +6,7 @@
+
+ import unittest
+
+-from morituri.common import musicbrainzngs
++from morituri.common import ourmusicbrainzngs
+
+
+ class MetadataTestCase(unittest.TestCase):
+@@ -19,6 +19,6 @@
+ handle.close()
+ discid = "wbjbST2jUHRZaB1inCyxxsL7Eqc-"
+
+- metadata = musicbrainzngs._getMetadata({}, response['release'], discid)
++ metadata = ourmusicbrainzngs._getMetadata({}, response['release'], discid)
+
+ self.failIf(metadata.release)
+--- a/morituri/test/test_common_program.py
++++ b/morituri/test/test_common_program.py
+@@ -7,7 +7,7 @@
+ import unittest
+
+ from morituri.result import result
+-from morituri.common import program, accurip, musicbrainzngs
++from morituri.common import program, accurip, ourmusicbrainzngs
+ from morituri.rip import common as rcommon
+
+
+@@ -95,7 +95,7 @@
+
+ def testStandardTemplateFilled(self):
+ prog = program.Program()
+- md = musicbrainzngs.DiscMetadata()
++ md = ourmusicbrainzngs.DiscMetadata()
+ md.artist = md.sortName = 'Jeff Buckley'
+ md.title = 'Grace'
+ prog.metadata = md
+@@ -107,7 +107,7 @@
+
+ def testIssue66TemplateFilled(self):
+ prog = program.Program()
+- md = musicbrainzngs.DiscMetadata()
++ md = ourmusicbrainzngs.DiscMetadata()
+ md.artist = md.sortName = 'Jeff Buckley'
+ md.title = 'Grace'
+ prog.metadata = md
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list