From 4e2aca0dd5e66d050d0d68bda878c48e090cb56f Mon Sep 17 00:00:00 2001 From: Priscila Manhaes <psilva@iff.edu.br> Date: Thu, 14 Apr 2011 13:57:04 +0000 Subject: [PATCH] refactor to fix bug of ffmpeg with webm format git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk/utils@45441 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../handler/ffmpeg/tests/testAllVideoSupportedFormat.py | 2 +- cloudooo/handler/ffmpeg/tests/testFFMPEGHandler.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cloudooo/handler/ffmpeg/tests/testAllVideoSupportedFormat.py b/cloudooo/handler/ffmpeg/tests/testAllVideoSupportedFormat.py index 380b7a1..42b3dda 100644 --- a/cloudooo/handler/ffmpeg/tests/testAllVideoSupportedFormat.py +++ b/cloudooo/handler/ffmpeg/tests/testAllVideoSupportedFormat.py @@ -60,7 +60,7 @@ class TestAllSupportedFormat(HandlerTestCase): def testWebMFormat(self): """Test convert file to WebM format and the reverse convertion""" webm_mimetype, ogv_mimetype = self.runTestForType("webm") - self.assertEquals(webm_data, 'video/webm') + self.assertEquals(webm_mimetype, 'video/webm') # XXX This might expect 'video/ogg' but magic only got 'application/ogg' self.assertEquals(ogv_mimetype, 'application/ogg') diff --git a/cloudooo/handler/ffmpeg/tests/testFFMPEGHandler.py b/cloudooo/handler/ffmpeg/tests/testFFMPEGHandler.py index 3af7af1..b6427b5 100644 --- a/cloudooo/handler/ffmpeg/tests/testFFMPEGHandler.py +++ b/cloudooo/handler/ffmpeg/tests/testFFMPEGHandler.py @@ -52,7 +52,12 @@ class TestHandler(HandlerTestCase): def testsetMetadata(self): """ Test if metadata are inserted correclty """ - self.assertRaises(NotImplementedError, self.input.setMetadata) + metadata_dict = {"title": "Set Metadata Test", "creator": "cloudooo"} + output = self.input.setMetadata(metadata_dict) + handler = Handler(self.tmp_url, output, "ogv", **self.kw) + metadata = Handler.getMetadata() + self.assertEquals(metadata["title"], "Set Metadata Test") + self.assertEquals(metadata["creator"], "cloudooo") def testConvertAudio(self): """Test coversion of audio to another format""" -- 2.30.9