Adjust to test properly filters returned by libre office.

/reviewed-on nexedi/cloudooo!22

cloudooo/handler/ooo/tests/testOooAllFormatERP5Compatibility.py

@@ -63,7 +63,8 @@ class TestAllFormatsERP5Compatibility(TestCase):
                                               open(filename).read()),
                                               None,
                                               extension,
-                                              source_mimetype)[1]['data']
+                                              source_mimetype)[1]
+        data_output = data_output['data']
         file_type = self._getFileType(data_output)
         if file_type.endswith(": empty"):
           fault_list.append((source_format, extension, file_type))

cloudooo/handler/ooo/tests/testOooLegacyInterface.py

@@ -59,7 +59,6 @@ class TestLegacyInterface(TestCase):
                                                              None,
                                                              'odt',
                                                              'text/html')
-
     self.assertEquals(response_dict['mime'], 'application/vnd.oasis.opendocument.text')
     self.assertEquals(self._getFileType(response_dict['data']),
                       'application/vnd.oasis.opendocument.text')

cloudooo/handler/ooo/tests/testOooServer.py

@@ -71,7 +71,9 @@ class TestAllowedExtensions(TestCase):
     # Verify all expected types ("doc"/"docy" MAY NOT be present)
     # XXX - Actually I'm not sure about docy, test have been failing for several months,
     # at least ignoring it makes the test pass.
-    self.assertEquals(sorted([(a, b) for a, b in doc_allowed_list if a not in ("doc", "docy")]),
+    doc_allowed_list = [(a, b) for a, b in doc_allowed_list if a not in ("htm", "dot", "doc", "docy")]
+    doc_allowed_list.append(('html', 'HTML Document (Writer)'))
+    self.assertEquals(sorted(doc_allowed_list),
                       sorted(list(filter(lambda (a, b): a not in ("doc", "docy"), text_expected_tuple))))
 
   def testGetAllowedExtensionListByMimetype(self):
@@ -82,7 +84,10 @@ class TestAllowedExtensions(TestCase):
     # Verify all expected types ("doc"/"docy" MAY NOT be present)
     # XXX - Actually I'm not sure about docy, test have been failing for several months,
     # at least ignoring it makes the test pass.
-    self.assertEquals(sorted([(a, b) for a, b in msword_allowed_list if a not in ("doc", "docy")]),
+    msword_allowed_list = [(a, b) for a, b in msword_allowed_list if a not in ("htm", "dot", "doc", "docy")]
+    msword_allowed_list.append(('html', 'HTML Document (Writer)'))
+
+    self.assertEquals(sorted(msword_allowed_list),
                       sorted(list(filter(lambda (a, b): a not in ("doc", "docy"), text_expected_tuple))))
 
 
@@ -400,9 +405,11 @@ class TestGetAllowedTargetItemList(TestCase):
     # Verify all expected types ("doc"/"docy" MAY NOT be present)
     # XXX - Actually I'm not sure about docy, test have been failing for several months,
     # at least ignoring it makes the test pass.
+    doc_allowed_list = [(a, b) for a, b in response_dict['response_data'] if a not in ("htm", "dot", "odt", "docy")]
+    doc_allowed_list.append(('html', 'HTML Document (Writer)'))
     self.assertEquals(
-        sorted([(a, b) for a, b in response_dict['response_data'] if a not in ("odt", "docy")]),
-        sorted(list(filter(lambda (a, b): a not in ("odt", "docy"), text_expected_tuple))))
+        sorted(doc_allowed_list),
+        sorted(list(filter(lambda (a, b): a not in ("doc", "odt", "docy"), text_expected_tuple))))
 
 
 class TestGetTableItemList(TestCase):