testERP5Catalog py3

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Catalog.py

@@ -1655,7 +1655,7 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
 
   def test_54_FixIntUid(self):
     if six.PY3:
-      return unittest.skipTest(
+      return unittest.SkipTest(
         "Python3 does not have different types for int and long")
     portal = self.getPortal()
 
@@ -3330,7 +3330,7 @@ VALUES
   def test_reindexWithGroupId(self):
     CatalogTool = type(self.getCatalogTool().aq_base)
     counts = []
-    orig_catalogObjectList = CatalogTool.catalogObjectList.__func__
+    orig_catalogObjectList = CatalogTool.catalogObjectList
     def catalogObjectList(self, object_list, *args, **kw):
       counts.append(len(object_list))
       return orig_catalogObjectList(self, object_list, *args, **kw)
@@ -4134,7 +4134,7 @@ VALUES
     self.assertEqual(six.moves.http_client.OK, ret.getStatus())
     # check if we did not just publish the result of `str(portal_catalog.__call__())`,
     # but a proper page
-    self.assertIn('<title>Catalog Tool - portal_catalog', ret.getBody())
+    self.assertIn(b'<title>Catalog Tool - portal_catalog', ret.getBody())
 
   def testSearchNonAsciiWithTheInitUser(self):
     """