Changeset 3114 in products for quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests

Timestamp:

Apr 14, 2011 4:45:57 PM (13 years ago)

Author:

kroman0

Message:

Pyflakes and pep8 fixes

Location:

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests

Files:

• base.py (modified) (1 diff)
• testQPloneCommentsCommenting.py (modified) (13 diffs)
• testQPloneCommentsConfiglet.py (modified) (2 diffs)
• testQPloneCommentsModeration.py (modified) (1 diff)
• testQPloneCommentsNotification.py (modified) (3 diffs)
• testQPloneCommentsNotificationRecipients.py (modified) (1 diff)
• testQPloneCommentsReportAbuse.py (modified) (1 diff)
• tests.py (modified) (1 diff)

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/base.py

@@ -4 +4 @@
 
 from Testing import ZopeTestCase as ztc
-from AccessControl.SecurityManagement import newSecurityManager, \
-    noSecurityManager
-
 from Products.PloneTestCase import PloneTestCase as ptc
-from Products.PloneTestCase.layer import onsetup, PloneSiteLayer
-from Products.CMFCore.utils import getToolByName
+from Products.PloneTestCase.layer import onsetup
 
 from quintagroup.plonecomments.tests.config import PRODUCT

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsCommenting.py

@@ -16 +16 @@
         self.request = self.app.REQUEST
 
-        # VERY IMPORTANT to guarantee product skin's content visibility
+        # VERY IMPORTANT to guarantee product skin's content visibility
         self._refreshSkinData()
 
@@ -23 +23 @@
         for user_id in USERS.keys():
             self.membership.addMember(user_id, USERS[user_id]['passw'],
-                USERS[user_id]['roles'], [])
+                USERS[user_id]['roles'], [])
 
         # Add users to Discussion Manager group
         portal_groups = getToolByName(self.portal, 'portal_groups')
         dm_group = portal_groups.getGroupById('DiscussionManager')
-        dm_users = [dm_group.addMember(u) for u in DM_USERS_IDS]
+        [dm_group.addMember(u) for u in DM_USERS_IDS]
 
         # Allow discussion for Document
@@ -71 +71 @@
         replies_after = len(self.discussion.getDiscussionFor(doc_obj).getReplies())
         self.failUnless(replies_after-replies_before,
-            "Anonymous user CAN'T really add comment in terned ON *Anonymous commenting mode*.")
+            "Anonymous user CAN'T really add comment in terned ON *Anonymous commenting mode*.")
 
     def testAddCommentToDocNotAnonymUsers(self):
@@ -119 +119 @@
                 self.login(u)
             self.assertRaises(Unauthorized, doc_obj.discussion_reply,
-                "%s's reply" % u, "text of '%s' reply" % u)
+                "%s's reply" % u, "text of '%s' reply" % u)
             self.login('dm_admin')
             replies_after = self.discussion.getDiscussionFor(doc_obj).getReplies()
@@ -126 +126 @@
                 failed_users.append(u)
         self.failIf(failed_users,
-            "%s user(s) CAN really add comment in terned OFF "
-            "*Anonymous commenting mode*." % failed_users)
+            "%s user(s) CAN really add comment in terned OFF "
+            "*Anonymous commenting mode*." % failed_users)
 
 
@@ -151 +151 @@
                 failed_users.append(u)
         self.failIf(failed_users,
-            "%s - user(s) can not really add commentin terned OFF "
-            "*Anonymous commenting mode*." % failed_users)
+            "%s - user(s) can not really add commentin terned OFF "
+            "*Anonymous commenting mode*." % failed_users)
 
 
@@ -194 +194 @@
                 failed_users.append(u)
         self.failIf(failed_users,
-            "%s - member(s) of DiscussionManager group CAN'T really ADD comment" % failed_users)
+            "%s - member(s) of DiscussionManager group CAN'T really ADD comment" % failed_users)
 
         # This is actual only in terned OFF *Anonymous commenting mode*
@@ -210 +210 @@
                 failed_users.append(u)
         self.failIf(failed_users,
-            "%s user(s) CAN really add comment in terned OFF "
-            "*Anonymous commenting mode*." % failed_users)
+            "%s user(s) CAN really add comment in terned OFF "
+            "*Anonymous commenting mode*." % failed_users)
 
     """
@@ -263 +263 @@
                 failed_users.append(u)
         self.failIf(failed_users,
-            "%s - user(s) can not really add comment to PUBLISHED reply." % failed_users)
+            "%s - user(s) can not really add comment to PUBLISHED reply." % failed_users)
 
         # 3.Check adding reply to reply for illegal users
@@ -274 +274 @@
             self.discussion.getDiscussionFor(reply)
             self.assertRaises(Unauthorized, reply.discussion_reply,
-                "Reply %s" % u, "text of %s reply" % u)
+                "Reply %s" % u, "text of %s reply" % u)
 
 
@@ -304 +304 @@
         self.discussion.getDiscussionFor(doc_obj)
         doc_obj.discussion_reply("A Reply to '%s'" % self.doc_moder_off_id,
-            "text of reply to '%s'" % self.doc_moder_off_id)
+            "text of reply to '%s'" % self.doc_moder_off_id)
 
 
@@ -330 +330 @@
                 failed_users.append(u)
         self.failIf(failed_users ,
-            "%s - member(s) CAN'T really ADD comment in terned off"
-            " comments Moderation mode." % failed_users)
+            "%s - member(s) CAN'T really ADD comment in terned off"
+            " comments Moderation mode." % failed_users)
 
 
@@ -350 +350 @@
             self.discussion.getDiscussionFor(reply_to_doc)
             self.assertRaises(Unauthorized, reply_to_doc.discussion_reply,
-            "%s's reply" % u, "text of '%s' reply" % u)
+            "%s's reply" % u, "text of '%s' reply" % u)
 
 

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsConfiglet.py

@@ -21 +21 @@
     portal_groups = getToolByName(self.portal, 'portal_groups')
     dm_group = portal_groups.getGroupById('DiscussionManager')
-    dm_users = [dm_group.addMember(u) for u in DM_USERS_IDS]
+    [dm_group.addMember(u) for u in DM_USERS_IDS]
 
 
@@ -61 +61 @@
 
         # Add testing document to portal
-        my_doc = self.portal.invokeFactory('Document', id='my_doc')
+        self.portal.invokeFactory('Document', id='my_doc')
         self.my_doc = self.portal['my_doc']
         self.my_doc.edit(text_format='plain', text='hello world')
 
     def testAnonymousCommenting(self):
-        getPortalReplyPerm = self.portal.rolesOfPermission
         def getReplyRoles():
-            return [r['name'] for r in getPortalReplyPerm(ReplyToItem) if r['selected']=='SELECTED']
+            return [r['name']
+                    for r in self.portal.rolesOfPermission(ReplyToItem)
+                    if r['selected'] == 'SELECTED']
         # Simulate switching ON Anonymous Commenting
         self.request.form['enable_anonymous_commenting'] = 'True'

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsModeration.py

@@ -204 +204 @@
         for u in managers:
             self.login(u)
-            auth = '%s:%s' % (u,USERS[u]['passw'])
             doc_id = "doc_%s" % u
             doc_obj = getattr(self.portal, doc_id)

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsNotification.py

@@ -27 +27 @@
     def afterSetUp(self):
         self.portal._original_MailHost = self.portal.MailHost
-        self.portal.MailHost = mailhost = MockMailHost('MailHost')
+        self.portal.MailHost = MockMailHost('MailHost')
 
         self.loginAsPortalOwner()
@@ -62 +62 @@
 
         # Add testing document to portal
-        my_doc = self.portal.invokeFactory('Document', id='my_doc', title='Doc')
+        self.portal.invokeFactory('Document', id='my_doc', title='Doc')
         self.my_doc = self.portal['my_doc']
         self.my_doc.edit(text_format='plain', text='hello world')
@@ -126 +126 @@
         reply = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0]
         reply.discussion_reply('A Reply for comment' ,'text of reply for comment')
-        reply_for_comment = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0]
+        self.discussion.getDiscussionFor(self.my_doc).getReplies()[0]
         self.failUnless(testMailExistance(self), 'Mail was not sended when enable_reply_user_notification.')
 

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsNotificationRecipients.py

@@ -40 +40 @@
     def afterSetUp(self):
         self.portal._original_MailHost = self.portal.MailHost
-        self.portal.MailHost = mailhost = MockMailHost('MailHost')
+        self.portal.MailHost = MockMailHost('MailHost')
 
         self.loginAsPortalOwner()

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsReportAbuse.py

@@ -1 @@
-from Products.CMFCore.utils import getToolByName
 from quintagroup.plonecomments.tests.testQPloneCommentsCommenting import \
     TestCommBase
-from zExceptions import Unauthorized
 
 

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/tests.py

@@ -1 +1 @@
 import unittest
 
-from zope.testing import doctestunit
-from zope.component import testing
-from Testing import ZopeTestCase as ztc
-
-from base import getToolByName, TestCase
+#from zope.testing import doctestunit
+#from zope.component import testing
+#from Testing import ZopeTestCase as ztc
+#from base import TestCase
 
 def test_suite():