[Erp5-report] r44831 priscila.manhaes - /erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Mar 31 01:23:17 CEST 2011
Author: priscila.manhaes
Date: Thu Mar 31 01:23:17 2011
New Revision: 44831
URL: http://svn.erp5.org?rev=44831&view=rev
Log:
TYPO and extract ogg test cause is not concidered an video type
Added:
erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllVideoSupportedFormat.py
- copied, changed from r44823, erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllSupportedFormat.py
Removed:
erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllSupportedFormat.py
Removed: erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllSupportedFormat.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllSupportedFormat.py?rev=44830&view=auto
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllSupportedFormat.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllSupportedFormat.py (removed)
@@ -1,118 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
-# Priscila Manhaes <psilva at iff.edu.br>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
-from magic import Magic
-from cloudooo.handler.ffmpeg.handler import Handler
-from cloudooo.handler.tests.handlerTestCase import HandlerTestCase, make_suite
-
-
-class TestAllSupportedFormat(HandlerTestCase):
-
- def afterSetUp(self):
- self.data = open("./data/test.ogv").read()
- self.kw = dict(env=dict(PATH=self.env_path))
- self.input = Handler(self.tmp_url, self.data, "ogv", **self.kw)
- self.file_detector = Magic(mime=True)
-
- def afterFormat(self, data):
- ogv_file = Handler(self.tmp_url, data, "avi", **self.kw)
- ogv_data = ogv_file.convert("ogv")
- ogv_mimetype = self.file_detector.from_buffer(ogv_data)
- return ogv_mimetype
-
- def testAviFormat(self):
- """Test convert file to avi format the reverse convertion"""
- avi_data = self.input.convert("avi")
- avi_mimetype = self.file_detector.from_buffer(avi_data)
- # XXX this might expect 'video/avi' but magic only got 'video/x-msvideo'
- self.assertEquals(avi_mimetype, 'video/x-msvideo')
- ogv_mimetype = self.afterFormat(avi_data)
- # XXX This might expect 'video/ogg' but magic only got 'application/ogg'
- self.assertEquals(ogv_mimetype, 'application/ogg')
-
- def testMp4Format(self):
- """Test convert file to mp4 format the reverse convertion"""
- mp4_data = self.input.convert("mp4")
- mp4_mimetype = self.file_detector.from_buffer(mp4_data)
- self.assertEquals(mp4_mimetype, 'video/mp4')
- ogv_mimetype = self.afterFormat(mp4_data)
- # XXX This might expect 'video/ogg' but magic only got 'application/ogg'
- self.assertEquals(ogv_mimetype, 'application/ogg')
-
- def testWebMFormat(self):
- """Test convert file to WebM format and the reverse convertion"""
- webm_data = self.input.convert("webm")
- webm_mimetype = self.file_detector.from_buffer(webm_data)
- self.assertEquals(webm_mimetype, 'video/webm')
- ogv_mimetype = self.afterFormat(webm_data)
- # XXX This might expect 'video/ogg' but magic only got 'application/ogg'
- self.assertEquals(ogv_mimetype, 'application/ogg')
-
- def testFlvFormat(self):
- """Test convert file to flash format the reverse convertion"""
- flv_data = self.input.convert("flv")
- flv_mimetype = self.file_detector.from_buffer(flv_data)
- # XXX this might expect 'application/x-shockwave-flash' but magic only got
- # 'video/x-flv'
- self.assertEquals(flv_mimetype, 'video/x-flv')
- ogv_mimetype = self.afterFormat(flv_data)
- # XXX This might expect 'video/ogg' but magic only got 'application/ogg'
- self.assertEquals(ogv_mimetype, 'application/ogg')
-
- def testMpegFormat(self):
- """Test convert file to Mpeg format the reverse convertion"""
- mpeg_data = self.input.convert("mpeg")
- mpeg_mimetype = self.file_detector.from_buffer(mpeg_data)
- self.assertEquals(mpeg_mimetype, 'video/mpeg')
- ogv_mimetype = self.afterFormat(mpeg_data)
- # XXX This might expect 'video/ogg' but magic only got 'application/ogg'
- self.assertEquals(ogv_mimetype, 'application/ogg')
-
- def testMkvFormat(self):
- """Test convert file to matroska format the reverse convertion"""
- mkv_data = self.input.convert("mkv")
- mkv_mimetype = self.file_detector.from_buffer(mkv_data)
- # XXX This might expect 'video/x-matroska' but magic only got
- # 'application/octet-stream'
- self.assertEquals(mkv_mimetype, 'application/octet-stream')
- ogv_mimetype = self.afterFormat(mkv_data)
- # XXX This might expect 'video/ogg' but magic only got 'application/ogg'
- self.assertEquals(ogv_mimetype, 'application/ogg')
-
- def testOggFormat(self):
- """Test convert file to ogg format the reverse convertion"""
- ogg_data = self.input.convert("ogg")
- ogg_mimetype = self.file_detector.from_buffer(ogg_data)
- self.assertEquals(ogg_mimetype, 'application/ogg')
- ogv_mimetype = self.afterFormat(ogg_data)
- # XXX This might expect 'video/ogg' but magic only got 'application/ogg'
- self.assertEquals(ogv_mimetype, 'application/ogg')
-
-
-def test_suite():
- return make_suite(TestAllSupportedFormat)
Copied: erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllVideoSupportedFormat.py (from r44823, erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllSupportedFormat.py)
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllVideoSupportedFormat.py?p2=erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllVideoSupportedFormat.py&p1=erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllSupportedFormat.py&r1=44823&r2=44831&rev=44831&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllSupportedFormat.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ffmpeg/tests/testAllVideoSupportedFormat.py [utf8] Thu Mar 31 01:23:17 2011
@@ -39,8 +39,8 @@ class TestAllSupportedFormat(HandlerTest
self.input = Handler(self.tmp_url, self.data, "ogv", **self.kw)
self.file_detector = Magic(mime=True)
- def afterFormat(self, data):
- ogv_file = Handler(self.tmp_url, data, "avi", **self.kw)
+ def afterFormat(self, data, source_format):
+ ogv_file = Handler(self.tmp_url, data, source_format, **self.kw)
ogv_data = ogv_file.convert("ogv")
ogv_mimetype = self.file_detector.from_buffer(ogv_data)
return ogv_mimetype
@@ -51,7 +51,7 @@ class TestAllSupportedFormat(HandlerTest
avi_mimetype = self.file_detector.from_buffer(avi_data)
# XXX this might expect 'video/avi' but magic only got 'video/x-msvideo'
self.assertEquals(avi_mimetype, 'video/x-msvideo')
- ogv_mimetype = self.afterFormat(avi_data)
+ ogv_mimetype = self.afterFormat(avi_data,"avi")
# XXX This might expect 'video/ogg' but magic only got 'application/ogg'
self.assertEquals(ogv_mimetype, 'application/ogg')
@@ -60,7 +60,7 @@ class TestAllSupportedFormat(HandlerTest
mp4_data = self.input.convert("mp4")
mp4_mimetype = self.file_detector.from_buffer(mp4_data)
self.assertEquals(mp4_mimetype, 'video/mp4')
- ogv_mimetype = self.afterFormat(mp4_data)
+ ogv_mimetype = self.afterFormat(mp4_data,"mp4")
# XXX This might expect 'video/ogg' but magic only got 'application/ogg'
self.assertEquals(ogv_mimetype, 'application/ogg')
@@ -69,7 +69,7 @@ class TestAllSupportedFormat(HandlerTest
webm_data = self.input.convert("webm")
webm_mimetype = self.file_detector.from_buffer(webm_data)
self.assertEquals(webm_mimetype, 'video/webm')
- ogv_mimetype = self.afterFormat(webm_data)
+ ogv_mimetype = self.afterFormat(webm_data,"webm")
# XXX This might expect 'video/ogg' but magic only got 'application/ogg'
self.assertEquals(ogv_mimetype, 'application/ogg')
@@ -80,7 +80,7 @@ class TestAllSupportedFormat(HandlerTest
# XXX this might expect 'application/x-shockwave-flash' but magic only got
# 'video/x-flv'
self.assertEquals(flv_mimetype, 'video/x-flv')
- ogv_mimetype = self.afterFormat(flv_data)
+ ogv_mimetype = self.afterFormat(flv_data,"flv")
# XXX This might expect 'video/ogg' but magic only got 'application/ogg'
self.assertEquals(ogv_mimetype, 'application/ogg')
@@ -89,7 +89,7 @@ class TestAllSupportedFormat(HandlerTest
mpeg_data = self.input.convert("mpeg")
mpeg_mimetype = self.file_detector.from_buffer(mpeg_data)
self.assertEquals(mpeg_mimetype, 'video/mpeg')
- ogv_mimetype = self.afterFormat(mpeg_data)
+ ogv_mimetype = self.afterFormat(mpeg_data,"mpeg")
# XXX This might expect 'video/ogg' but magic only got 'application/ogg'
self.assertEquals(ogv_mimetype, 'application/ogg')
@@ -100,19 +100,9 @@ class TestAllSupportedFormat(HandlerTest
# XXX This might expect 'video/x-matroska' but magic only got
# 'application/octet-stream'
self.assertEquals(mkv_mimetype, 'application/octet-stream')
- ogv_mimetype = self.afterFormat(mkv_data)
+ ogv_mimetype = self.afterFormat(mkv_data,"mkv")
# XXX This might expect 'video/ogg' but magic only got 'application/ogg'
self.assertEquals(ogv_mimetype, 'application/ogg')
- def testOggFormat(self):
- """Test convert file to ogg format the reverse convertion"""
- ogg_data = self.input.convert("ogg")
- ogg_mimetype = self.file_detector.from_buffer(ogg_data)
- self.assertEquals(ogg_mimetype, 'application/ogg')
- ogv_mimetype = self.afterFormat(ogg_data)
- # XXX This might expect 'video/ogg' but magic only got 'application/ogg'
- self.assertEquals(ogv_mimetype, 'application/ogg')
-
-
def test_suite():
return make_suite(TestAllSupportedFormat)
More information about the Erp5-report
mailing list