[Erp5-report] r41773 gabriel - in /erp5/trunk/utils/cloudooo/cloudooo: bin/ handler/ tests/

[nobody at svn.erp5.org]

Author: gabriel
Date: Sun Dec 26 20:00:08 2010
New Revision: 41773

URL: http://svn.erp5.org?rev=41773&view=rev
Log:
update tests and fix regex to extract the exception on stderr

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/bin/cloudooo_tester.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py
    erp5/trunk/utils/cloudooo/cloudooo/tests/testServer.py
    erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoMimemapper.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/bin/cloudooo_tester.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/bin/cloudooo_tester.py?rev=41773&r1=41772&r2=41773&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/bin/cloudooo_tester.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/bin/cloudooo_tester.py [utf8] Sun Dec 26 20:00:08 2010
@@ -20,7 +20,7 @@ class CloudoooTestCase(unittest.TestCase
   def test_run_generate(self):
     data = encodestring(DOCUMENT_STRING)
     proxy = ServerProxy(self.proxy_address, allow_none=True)
-    res = proxy.run_generate("t.text", data, None, 'pdf', 'txt')
+    res = proxy.run_generate("t.text", data, None, 'pdf', 'text/plain')
     self.assertEquals(res[1]['mime'], "application/pdf")
     self.assertEquals(res[0], 200)
 

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py?rev=41773&r1=41772&r2=41773&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py [utf8] Sun Dec 26 20:00:08 2010
@@ -120,7 +120,7 @@ class OOHandler:
       openoffice.start()
     command = self._getCommand(*feature_list, **kw)
     stdout, stderr = self._subprocess(command)
-    if not stdout and len(re.findall("[A-Za-z]*Exception", stderr)) >= 1:
+    if not stdout and len(re.findall("\w*Exception|\w*Error", stderr)) >= 1:
       logger.debug(stderr)
       self.document.restoreOriginal()
       openoffice.restart()

Modified: erp5/trunk/utils/cloudooo/cloudooo/tests/testServer.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/tests/testServer.py?rev=41773&r1=41772&r2=41773&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/tests/testServer.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/tests/testServer.py [utf8] Sun Dec 26 20:00:08 2010
@@ -264,7 +264,7 @@ class TestServer(cloudoooTestCase):
     output_msg = 'Zip archive data, at least v2.0 to extract\n'
     self._testConvertFile("data/test.zip",
                           join(self.tmp_url, "output_zipfile.zip"),
-                          'html',
+                          'zip',
                           'txt',
                           output_msg,
                           True)
@@ -274,7 +274,7 @@ class TestServer(cloudoooTestCase):
     output_url = join(self.tmp_url, "output.txt")
     self._testConvertFile("data/test.zip",
                           output_url,
-                          'html',
+                          'zip',
                           'txt',
                           'ASCII text\n')
 
@@ -375,10 +375,9 @@ class TestServer(cloudoooTestCase):
     self.assertEquals(response_code, 402)
     self.assertEquals(type(response_dict), DictType)
     self.assertEquals(response_dict, {})
-    msg = 'No JSON object could be decoded'
-    self.assertEquals(response_message, 
-                      'No JSON object could be decoded',
-                      "%s != %s" % (response_message, msg))
+    msg = "This document can not be loaded or is empty\n"
+    self.assertTrue(response_message.endswith(msg), 
+                    "%s != %s" % (response_message, msg))
 
   def testRunGenerateMethod(self):
     """Test run_generate method"""

Modified: erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoMimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoMimemapper.py?rev=41773&r1=41772&r2=41773&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoMimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoMimemapper.py [utf8] Sun Dec 26 20:00:08 2010
@@ -27,6 +27,7 @@
 ##############################################################################
 
 import unittest
+import json
 import pkg_resources
 from cloudooo.application.openoffice import openoffice
 from subprocess import Popen, PIPE
@@ -62,7 +63,7 @@ class TestUnoMimeMapper(cloudoooTestCase
     stdout, stderr = Popen(' '.join(command), shell=True,
         stdout=PIPE, stderr=PIPE).communicate()
     self.assertEquals(stderr, '')
-    exec(stdout)
+    filter_dict, type_dict = json.loads(stdout)
     self.assertEquals('filter_dict' in locals(), True)
     self.assertEquals('type_dict' in locals(), True)
     self.assertNotEquals(filter_dict.get('writer8'), None)
@@ -82,7 +83,7 @@ class TestUnoMimeMapper(cloudoooTestCase
     stdout, stderr = Popen(' '.join(command), shell=True,
         stdout=PIPE, stderr=PIPE).communicate()
     self.assertEquals(stderr, '')
-    exec(stdout)
+    filter_dict, type_dict = json.loads(stdout)
     self.assertEquals('filter_dict' in locals(), True)
     self.assertEquals('type_dict' in locals(), True)
     self.assertNotEquals(filter_dict.get('writer8'), None)