[Erp5-report] r42108 nicolas - /erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Jan  7 10:33:24 2011
New Revision: 42108

URL: http://svn.erp5.org?rev=42108&view=rev
Log:
Fix test and use python-magic

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testAllFormats.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testAllFormats.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testAllFormats.py?rev=42108&r1=42107&r2=42108&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testAllFormats.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testAllFormats.py [utf8] Fri Jan  7 10:33:24 2011
@@ -31,7 +31,9 @@ from xmlrpclib import ServerProxy, Fault
 from subprocess import Popen, PIPE
 from base64 import encodestring, decodestring
 from cloudoooTestCase import CloudoooTestCase, make_suite
+import magic
 
+file_detector = magic.Magic()
 DAEMON = True
 
 class TestAllFormats(CloudoooTestCase):
@@ -82,13 +84,8 @@ class TestAllFormats(CloudoooTestCase):
                                               extension[0], 
                                               err.faultString))
          continue
-      output_file_url = '%s/test_%s.%s' % (self.tmp_url, document_type, extension[0])
-      open(output_file_url, 'w').write(decodestring(data_output))
-      command = [file, output_file_url]
-      stdout, stderr = Popen(command, 
-                            stdout=PIPE,
-                            stderr=PIPE).communicate()
-      self.assertEquals(stdout.endswith(": empty"), False, stdout)
+      magic_result = file_detector.from_buffer(decodestring(data_output))
+      self.assertEquals(magic_result.endswith(": empty"), False, magic_result)
     if fault_list != []:
       raise Fault(1, "\n".join(fault_list))