[Erp5-report] r42111 gabriel - /erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/

[nobody at svn.erp5.org]

Author: gabriel
Date: Fri Jan  7 11:22:09 2011
New Revision: 42111

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

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

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoConverter.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoConverter.py?rev=42111&r1=42110&r2=42111&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoConverter.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoConverter.py [utf8] Fri Jan  7 11:22:09 2011
@@ -28,6 +28,7 @@
 
 import unittest
 import json
+import magic
 import pkg_resources
 from subprocess import Popen, PIPE
 from os.path import exists, join
@@ -80,15 +81,9 @@ class TestUnoConverter(CloudoooTestCase)
     self.assertEquals(stderr, '')
     output_url = stdout.replace('\n', '')
     self.assertTrue(exists(output_url), stdout)
-    command = [file, output_url]
-    stdout, stderr = Popen(command,
-                           stdout=PIPE, 
-                           stderr=PIPE).communicate()
-    self.assertEquals(self.file_msg_list[1] in stdout \
-                      or \
-                      self.file_msg_list[0] in stdout,
-                      True,
-                      "%s don't have %s" % (self.file_msg_list, stdout))
+    file_detector = magic.Magic()
+    magic_result = file_detector.from_buffer(output_url)
+    self.assertTrue(magic_result.startswith("ASCII text"))
     self.document.trash()
     self.assertEquals(exists(output_url), False)