diff --git a/morituri/test/common.py b/morituri/test/common.py index 97e716e..955db36 100644 --- a/morituri/test/common.py +++ b/morituri/test/common.py @@ -31,7 +31,8 @@ def _diff(old, new, desc): def diffStrings(orig, new, desc='input'): - assert type(orig) == type(new) + assert type(orig) == type(new), 'type %s and %s are different' % ( + type(orig), type(new)) def _tolines(s): return [line + '\n' for line in s.split('\n')] diff --git a/morituri/test/test_image_toc.py b/morituri/test/test_image_toc.py index 6485a4c..24e9345 100644 --- a/morituri/test/test_image_toc.py +++ b/morituri/test/test_image_toc.py @@ -85,7 +85,8 @@ class CureTestCase(common.TestCase): def testConvertCue(self): self.toc.table.absolutize() cue = self.toc.table.cue() - ref = open(os.path.join(os.path.dirname(__file__), 'cure.cue')).read() + ref = open(os.path.join(os.path.dirname(__file__), 'cure.cue')).read( + ).decode('utf-8') common.diffStrings(cue, ref) # we verify it because it has failed in readdisc in the past