fix tests in py3

src/collective/ifttt/tests/test_iftttaction.py

@@ -56,22 +56,20 @@ def test_AddFormView(self):
 
         addview.form_instance.update()
 
-        payload_option = payload_options.by_value.keys()
-
-        for i in range(len(payload_option)):
+        for index, option in enumerate(payload_options):
 
             content = addview.form_instance.create(
                 data={
                     'ifttt_event_name': 'ifttt_applet',
-                    'payload_option': payload_option[i],
+                    'payload_option': option,
                 }
             )
             addview.form_instance.add(content)
 
-            e = rule.actions[i]
+            e = rule.actions[index]
             self.assertTrue(isinstance(e, IftttTriggerAction))
             self.assertEqual('ifttt_applet', e.ifttt_event_name)
-            self.assertEqual(payload_option[i], e.payload_option)
+            self.assertEqual(option, e.payload_option)
 
     def test_EditFormView(self):
         element = getUtility(IRuleAction, name='plone.actions.Ifttt')
@@ -90,13 +88,12 @@ def test_ActionExecutor(self):
             value=u'secret',
         )
         element.ifttt_event_name = 'ifttt_applet'
-        payload_option = payload_options.by_value.keys()
 
-        for i in range(len(payload_option)):
+        for option in payload_options:
             # inspect logs
             handler = InstalledHandler('collective.ifttt.requests')
 
-            element.payload_option = payload_option[i]
+            element.payload_option = option.value
             ex = getMultiAdapter((context, element, DummyEvent(self.folder)),
                                  IExecutable)
             self.assertTrue(ex())

src/collective/ifttt/tests/test_setup.py

@@ -5,6 +5,7 @@
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from Products.CMFPlone.interfaces import INonInstallable
+from Products.CMFPlone.utils import get_installer
 from zope.component import getAllUtilitiesRegisteredFor
 
 import unittest
@@ -18,12 +19,13 @@ class TestSetup(unittest.TestCase):
     def setUp(self):
         """Custom shared utility setup for tests."""
         self.portal = self.layer['portal']
-        self.installer = api.portal.get_tool('portal_quickinstaller')
+        self.installer = get_installer(self.portal, self.layer['request'])
         self.setup = api.portal.get_tool('portal_setup')
 
     def test_product_installed(self):
         """Test if collective.ifttt is installed."""
-        self.assertTrue(self.installer.isProductInstalled('collective.ifttt'))
+        self.assertTrue(
+            self.installer.is_product_installed('collective.ifttt'))
 
     def test_product_upgrade(self):
         """Test if collective.ifttt can be upgraded."""
@@ -54,10 +56,10 @@ class TestUninstall(unittest.TestCase):
 
     def setUp(self):
         self.portal = self.layer['portal']
-        self.installer = api.portal.get_tool('portal_quickinstaller')
+        self.installer = get_installer(self.portal, self.layer['request'])
         roles_before = api.user.get_roles(TEST_USER_ID)
         setRoles(self.portal, TEST_USER_ID, ['Manager'])
-        self.installer.uninstallProducts(['collective.ifttt'])
+        self.installer.uninstall_product('collective.ifttt')
         setRoles(self.portal, TEST_USER_ID, roles_before)
 
     def test_hidden_uninstall_profile(self):
@@ -70,7 +72,8 @@ def test_hidden_uninstall_profile(self):
 
     def test_product_uninstalled(self):
         """Test if collective.ifttt is cleanly uninstalled."""
-        self.assertFalse(self.installer.isProductInstalled('collective.ifttt'))
+        self.assertFalse(
+            self.installer.is_product_installed('collective.ifttt'))
 
     def test_browserlayer_removed(self):
         """Test that ICollectiveIftttLayer is removed."""