Changeset 2981 in products

Timestamp:

Nov 5, 2010 2:06:37 PM (14 years ago)

Author:

kroman0

Message:

Fixed tests

Location:

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests

Files:

• testQPloneCommentsCommenting.py (modified) (1 diff)
• testQPloneCommentsConfiglet.py (modified) (1 diff)
• testQPloneCommentsModeration.py (modified) (1 diff)
• testQPloneCommentsNotificationRecipients.py (modified) (1 diff)
• testQPloneCommentsPermission.py (modified) (1 diff)
• testQPloneCommentsReportAbuse.py (modified) (1 diff)
• testQPloneCommentsUninstall.py (modified) (2 diffs)

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsCommenting.py

@@ -5 +5 @@
 from zExceptions import Unauthorized
 from base import getToolByName, FunctionalTestCase
-from config import *
+from config import USERS, PROPERTY_SHEET, DM_USERS_IDS, COMMON_USERS_IDS
 
 

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsConfiglet.py

@@ -6 +6 @@
 from AccessControl.SecurityManagement import noSecurityManager
 from base import getToolByName, FunctionalTestCase
-from config import *
+from config import USERS, PROPERTY_SHEET, DM_USERS_IDS, COMMON_USERS_IDS
 
 

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsModeration.py

@@ -6 +6 @@
 from common import *
 from base import getToolByName, FunctionalTestCase
-from config import *
+from config import USERS, PROPERTY_SHEET, DM_USERS_IDS, COMMON_USERS_IDS
 
 

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsNotificationRecipients.py

@@ -13 +13 @@
 from base import getToolByName, FunctionalTestCase
 from common import *
-from config import *
+from config import PROPERTY_SHEET
 
 from Products.CMFPlone.tests.utils import MockMailHost

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsPermission.py

@@ -6 +6 @@
 
 from base import getToolByName, TestCase
-from config import *
+from config import PERM_NAME
 
 

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsReportAbuse.py

@@ -1 +1 @@
 from base import getToolByName, TestCase
-from config import *
-
 from testQPloneCommentsCommenting import TestCommBase
 from zExceptions import Unauthorized
-
-USERS = {  # Common Members
-         'admin': {'passw': 'secret_admin', 'roles': ['Manager']},
-         'owner': {'passw': 'secret_owner', 'roles': ['Owner']},
-         'member': {'passw': 'secret_member', 'roles': ['Member']},
-         'reviewer': {'passw': 'secret_reviewer', 'roles': ['Reviewer']},
-           # Members for discussion manager group
-         'dm_admin': {'passw': 'secret_dm_admin', 'roles': ['Manager']},
-         'dm_owner': {'passw': 'secret_dm_owner', 'roles': ['Owner']},
-         'dm_member': {'passw': 'secret_dm_member', 'roles': ['Member']},
-         'dm_reviewer': {'passw': 'secret_dm_reviewer', 'roles': ['Reviewer']},
-        }
-COMMON_USERS_IDS = [u for u in USERS.keys() if not u.startswith('dm_')]
-COMMON_USERS_IDS.append('anonym')
-DM_USERS_IDS = [u for u in USERS.keys() if u.startswith('dm_')]
 
 

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsUninstall.py

@@ -7 +7 @@
 from base import getToolByName, TestErase
 from config import PRODUCT, PRODUCT_SKIN_NAME, CONFIGLET_ID, PROPERTY_SHEET
-
+from zExceptions import BadRequest
 
 class TestUninstallation(TestErase):
@@ -14 +14 @@
         self.loginAsPortalOwner()
         self.qi = self.portal.portal_quickinstaller
-        #self.qi.installProduct(PRODUCT)
-        #self.qi.uninstallProducts([PRODUCT])
+        self.qi.installProduct(PRODUCT)
+        try:
+            self.qi.uninstallProducts([PRODUCT])
+        except BadRequest:
+            pass
 
     def test_package_uninstall(self):