[SCM] morituri/master: fix test after moving templates

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Oct 19 20:09:53 UTC 2014


The following commit has been merged in the master branch:
commit dc0a3f961422d056fe659da0fbb2a31c0403a460
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Wed Jan 16 08:54:02 2013 +0100

    fix test after moving templates

diff --git a/morituri/test/test_common_program.py b/morituri/test/test_common_program.py
index 34f70bf..102540b 100644
--- a/morituri/test/test_common_program.py
+++ b/morituri/test/test_common_program.py
@@ -8,7 +8,7 @@ import unittest
 
 from morituri.result import result
 from morituri.common import program, accurip, musicbrainzngs
-from morituri.rip import cd
+from morituri.rip import common as rcommon
 
 
 class TrackImageVerifyTestCase(unittest.TestCase):
@@ -88,7 +88,8 @@ class PathTestCase(unittest.TestCase):
     def testStandardTemplateEmpty(self):
         prog = program.Program()
 
-        path = prog.getPath(u'/tmp', cd.DEFAULT_DISC_TEMPLATE, 'mbdiscid', 0)
+        path = prog.getPath(u'/tmp', rcommon.DEFAULT_DISC_TEMPLATE,
+            'mbdiscid', 0)
         self.assertEquals(path,
             u'/tmp/unknown/Unknown Artist - mbdiscid/Unknown Artist - mbdiscid')
 
@@ -99,7 +100,8 @@ class PathTestCase(unittest.TestCase):
         md.title = 'Grace'
         prog.metadata = md
 
-        path = prog.getPath(u'/tmp', cd.DEFAULT_DISC_TEMPLATE, 'mbdiscid', 0)
+        path = prog.getPath(u'/tmp', rcommon.DEFAULT_DISC_TEMPLATE,
+            'mbdiscid', 0)
         self.assertEquals(path,
             u'/tmp/unknown/Jeff Buckley - Grace/Jeff Buckley - Grace')
 

-- 
morituri packaging



More information about the pkg-multimedia-commits mailing list