* morituri/common/Makefile.am:

Add missing result.py
	* morituri/test/Makefile.am:
	* morituri/test/test_image_toc.py:
	* morituri/test/JoséGonzález.toc (added):
	* morituri/test/José González.toc (deleted):
	  automake doesn't handle spaces in names, so move it.

morituri/test/Makefile.am

@@ -22,6 +22,7 @@ EXTRA_DIST = \
 	capital.2.toc \
 	cure.cue \
 	cure.toc \
+	JoséGonzález.toc \
 	dBAR-011-0010e284-009228a3-9809ff0b.bin \
 	dBAR-020-002e5023-029d8e49-040eaa14.bin \
 	kanye.cue \
@@ -35,6 +36,7 @@ EXTRA_DIST = \
 	silentalarm.result.pickle \
 	track.flac
 
+
 # re-generation of test files when needed
 regenerate: track.flac
 
@@ -44,4 +46,3 @@ regenerate: track.flac
 
 track.flac:
 	gst-launch audiotestsrc num-buffers=10 samplesperbuffer=588 ! audioconvert ! audio/x-raw-int,channels=2,width=16,height=16,rate=44100 ! flacenc ! filesink location=track.flac
-

morituri/test/test_image_toc.py

@@ -210,9 +210,9 @@ class CapitalMergeTestCase(unittest.TestCase):
 
 class UnicodeTestCase(unittest.TestCase):
     def setUp(self):
+        path = u'Jos\xe9Gonz\xe1lez.toc'
         self._performer = u'Jos\xe9 Gonz\xe1lez'
-        self.toc = toc.TocFile(os.path.join(os.path.dirname(__file__),
-            '%s.toc' % self._performer))
+        self.toc = toc.TocFile(os.path.join(os.path.dirname(__file__), path))
         self.toc.parse()
         self.assertEquals(len(self.toc.table.tracks), 10)