Changeset 3128 in products for quintagroup.captcha.core/trunk/quintagroup/captcha/core/tests/testInstallation.py

Timestamp:

Apr 18, 2011 11:16:39 AM (13 years ago)

Author:

vmaksymiv

Message:

pep8 fixes

File:

• quintagroup.captcha.core/trunk/quintagroup/captcha/core/tests/testInstallation.py (modified) (7 diffs)

quintagroup.captcha.core/trunk/quintagroup/captcha/core/tests/testInstallation.py

@@ -1 +1 @@
 from base import *
+
 
 class TestInstallation(ptc.FunctionalTestCase):
@@ -15 +16 @@
     def testPropertysheetInstall(self):
         pp = getToolByName(self.portal, 'portal_properties')
-        self.assert_(PROPERTY_SHEET in pp.objectIds(), 'Property sheet isn\'t found')
+        msg = 'Property sheet isn\'t found'
+        self.assert_(PROPERTY_SHEET in pp.objectIds(), msg)
 
     def testPropertysheetUninstall(self):
@@ -24 +26 @@
 
     def testConfigletInstall(self):
-        self.assert_(CONFIGLET_ID in [a.getId() for a in self.cp.listActions()], 'Configlet not found')
+        list_ids = []
+        for action in self.cp.listActions():
+            list_ids.append(action.getId())
+        self.assert_(CONFIGLET_ID in list_ids, 'Configlet not found')
 
     def testConfigletUninstall(self):
         self.qi.uninstallProducts([PRODUCT_NAME])
-        self.assertNotEqual(self.qi.isProductInstalled(PRODUCT_NAME), True,'%s is already installed' % PRODUCT_NAME)
-        self.assert_(not CONFIGLET_ID in [a.getId() for a in self.cp.listActions()], 'Configlet found after uninstallation')
+        self.assertNotEqual(self.qi.isProductInstalled(PRODUCT_NAME), True,
+                            '%s is already installed' % PRODUCT_NAME)
+        list_ids = []
+        for action in self.cp.listActions():
+            list_ids.append(action.getId())
+        msg = 'Configlet found after uninstallation'
+        self.assert_(not CONFIGLET_ID in list_ids, msg)
 
     def testSkinsInstall(self):
@@ -38 +48 @@
             path = map(str.strip, path.split(','))
             for layer in layers:
-                self.assert_(layer.split('/')[0] in skinstool.objectIds(), '%s directory view not found in portal_skins after installation' % layer)
-                self.assert_(layer in path, '%s layer not found in %s' % (PRODUCT_NAME, skin))
+                msg = '%s directory view not found in'\
+                      'portal_skins after installation' % layer
+                self.assert_(layer.split('/')[0] in skinstool.objectIds(), msg)
+                msg = '%s layer not found in %s' % (PRODUCT_NAME, skin)
+                self.assert_(layer in path, msg)
 
     def testSkinsUninstall(self):
         self.qi.uninstallProducts([PRODUCT_NAME])
-        self.assertNotEqual(self.qi.isProductInstalled(PRODUCT_NAME), True,'%s is already installed' % PRODUCT_NAME)
+        self.assertNotEqual(self.qi.isProductInstalled(PRODUCT_NAME), True,
+                            '%s is already installed' % PRODUCT_NAME)
         skinstool = self.st
         layers = self.getLayers()
@@ -50 +64 @@
             path = map(str.strip, path.split(','))
             for layer in layers:
-                self.assert_(not layer.split('/')[0] in skinstool.objectIds(), '%s directory view found in portal_skins after uninstallation' % layer)
-                self.assert_(not layer in path, '%s layer found in %s after uninstallation' % (layer, skin))
+                msg = '%s directory view found in'\
+                      'portal_skins after uninstallation' % layer
+                skins_tool_ids = skinstool.objectIds()
+                self.assert_(not layer.split('/')[0] in skins_tool_ids, msg)
+                msg = '%s layer found in'\
+                      '%s after uninstallation' % (layer, skin)
+                self.assert_(not layer in path, msg)
 
     def testToolInstall(self):
@@ -58 +77 @@
     def testToolUninstall(self):
         self.qi.uninstallProducts([PRODUCT_NAME])
-        self.assertNotEqual(self.qi.isProductInstalled(PRODUCT_NAME), True, 
+        self.assertNotEqual(self.qi.isProductInstalled(PRODUCT_NAME), True,
             '%s is already installed' % PRODUCT_NAME)
         self.assert_(not TOOL_ID in self.portal.objectIds())
@@ -69 +88 @@
         self.assert_(not self.portal.hasProperty(CAPTCHA_KEY))
 
+
 def test_suite():
     suite = unittest.TestSuite()