diff sat/test/test_plugin_misc_groupblog.py @ 2765:378188abe941

misc: replaced all "dummy" by the more conventional and readable "__" ("_" being used for gettext)
author Goffi <goffi@goffi.org>
date Fri, 11 Jan 2019 11:13:15 +0100
parents 56f94936df1e
children 003b8b4b56a7
line wrap: on
line diff
--- a/sat/test/test_plugin_misc_groupblog.py	Fri Jan 11 10:18:02 2019 +0100
+++ b/sat/test/test_plugin_misc_groupblog.py	Fri Jan 11 11:13:15 2019 +0100
@@ -188,11 +188,11 @@
         d = self.psclient.items(SERVICE, NODE_ID)
         d.addCallback(lambda items: self.assertEqual(len(items), 0))
         d.addCallback(
-            lambda dummy: self.plugin.sendGroupBlog(
+            lambda __: self.plugin.sendGroupBlog(
                 "PUBLIC", [], "test", {}, C.PROFILE[0]
             )
         )
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID))
         return d.addCallback(lambda items: self.assertEqual(len(items), 1))
 
     def test_deleteGroupBlog(self):
@@ -207,7 +207,7 @@
 
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.plugin.deleteGroupBlog(
+            lambda __: self.plugin.deleteGroupBlog(
                 pub_data, COMMENTS_NODE_URL_1, profile_key=C.PROFILE[0]
             )
         )
@@ -220,11 +220,11 @@
         self._initialise(C.PROFILE[0])
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.plugin.updateGroupBlog(
+            lambda __: self.plugin.updateGroupBlog(
                 pub_data, COMMENTS_NODE_URL_1, new_text, {}, profile_key=C.PROFILE[0]
             )
         )
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID))
         return d.addCallback(
             lambda items: self.assertEqual(
                 "".join(items[0].entry.title.children), new_text
@@ -236,18 +236,18 @@
         d = self.psclient.items(SERVICE, NODE_ID)
         d.addCallback(lambda items: self.assertEqual(len(items), 0))
         d.addCallback(
-            lambda dummy: self.plugin.sendGroupBlogComment(
+            lambda __: self.plugin.sendGroupBlogComment(
                 COMMENTS_NODE_URL_1, "test", {}, profile_key=C.PROFILE[0]
             )
         )
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
         return d.addCallback(lambda items: self.assertEqual(len(items), 1))
 
     def test_getGroupBlogs(self):
         self._initialise(C.PROFILE[0])
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.plugin.getGroupBlogs(PUBLISHER, profile_key=C.PROFILE[0])
+            lambda __: self.plugin.getGroupBlogs(PUBLISHER, profile_key=C.PROFILE[0])
         )
         result = (
             [ITEM_DATA_1()],
@@ -259,7 +259,7 @@
         self._initialise(C.PROFILE[0])
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.plugin.getGroupBlogs(
+            lambda __: self.plugin.getGroupBlogs(
                 PUBLISHER, count_comments=False, profile_key=C.PROFILE[0]
             )
         )
@@ -273,7 +273,7 @@
         self._initialise(C.PROFILE[0])
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.plugin.getGroupBlogs(
+            lambda __: self.plugin.getGroupBlogs(
                 PUBLISHER, [ITEM_ID_1], profile_key=C.PROFILE[0]
             )
         )
@@ -287,7 +287,7 @@
         self._initialise(C.PROFILE[0])
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.plugin.getGroupBlogs(
+            lambda __: self.plugin.getGroupBlogs(
                 PUBLISHER, rsm_data={"max_": 1}, profile_key=C.PROFILE[0]
             )
         )
@@ -301,10 +301,10 @@
         self._initialise(C.PROFILE[0])
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.psclient.publish(SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1])
+            lambda __: self.psclient.publish(SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1])
         )
         d.addCallback(
-            lambda dummy: self.plugin.getGroupBlogsWithComments(
+            lambda __: self.plugin.getGroupBlogsWithComments(
                 PUBLISHER, [], profile_key=C.PROFILE[0]
             )
         )
@@ -331,12 +331,12 @@
         self._initialise(C.PROFILE[0])
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.psclient.publish(
+            lambda __: self.psclient.publish(
                 SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1, COMMENT_2]
             )
         )
         d.addCallback(
-            lambda dummy: self.plugin.getGroupBlogsWithComments(
+            lambda __: self.plugin.getGroupBlogsWithComments(
                 PUBLISHER, [], profile_key=C.PROFILE[0]
             )
         )
@@ -364,7 +364,7 @@
         self._initialise(C.PROFILE[0])
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.plugin.getGroupBlogsAtom(
+            lambda __: self.plugin.getGroupBlogsAtom(
                 PUBLISHER, {"max_": 1}, profile_key=C.PROFILE[0]
             )
         )
@@ -379,7 +379,7 @@
         self._initialise(C.PROFILE[0])
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.plugin.getMassiveGroupBlogs(
+            lambda __: self.plugin.getMassiveGroupBlogs(
                 "JID", [jid.JID(PUBLISHER)], {"max_": 1}, profile_key=C.PROFILE[0]
             )
         )
@@ -403,12 +403,12 @@
         self._initialise(C.PROFILE[0])
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.psclient.publish(
+            lambda __: self.psclient.publish(
                 SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1, COMMENT_2]
             )
         )
         d.addCallback(
-            lambda dummy: self.plugin.getMassiveGroupBlogs(
+            lambda __: self.plugin.getMassiveGroupBlogs(
                 "JID", [jid.JID(PUBLISHER)], {"max_": 1}, profile_key=C.PROFILE[0]
             )
         )
@@ -432,10 +432,10 @@
         self._initialise(C.PROFILE[0])
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.psclient.publish(SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1])
+            lambda __: self.psclient.publish(SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1])
         )
         d.addCallback(
-            lambda dummy: self.plugin.getGroupBlogComments(
+            lambda __: self.plugin.getGroupBlogComments(
                 SERVICE, COMMENTS_NODE_ID_1, {"max_": 1}, profile_key=C.PROFILE[0]
             )
         )
@@ -474,26 +474,26 @@
         self.host.profiles[C.PROFILE[0]].roster.addItem(jid.JID(OTHER_PUBLISHER))
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.psclient.publish(
+            lambda __: self.psclient.publish(
                 SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1, COMMENT_2]
             )
         )
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID))
         d.addCallback(lambda items: self.assertEqual(len(items), 1))
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
         d.addCallback(lambda items: self.assertEqual(len(items), 2))
 
         d.addCallback(
-            lambda dummy: self.psclient.publish(SERVICE, OTHER_NODE_ID, [ITEM_2])
+            lambda __: self.psclient.publish(SERVICE, OTHER_NODE_ID, [ITEM_2])
         )
         d.addCallback(
-            lambda dummy: self.psclient.publish(
+            lambda __: self.psclient.publish(
                 SERVICE, COMMENTS_NODE_ID_2, [COMMENT_1, COMMENT_2]
             )
         )
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, OTHER_NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, OTHER_NODE_ID))
         d.addCallback(lambda items: self.assertEqual(len(items), 1))
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2))
         d.addCallback(lambda items: self.assertEqual(len(items), 2))
 
         def clean(res):
@@ -502,17 +502,17 @@
             ]
             return res
 
-        d.addCallback(lambda dummy: self.plugin.deleteAllGroupBlogs(C.PROFILE[0]))
+        d.addCallback(lambda __: self.plugin.deleteAllGroupBlogs(C.PROFILE[0]))
         d.addCallback(clean)
 
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID))
         d.addCallback(lambda items: self.assertEqual(len(items), 0))
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
         d.addCallback(lambda items: self.assertEqual(len(items), 0))
 
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, OTHER_NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, OTHER_NODE_ID))
         d.addCallback(lambda items: self.assertEqual(len(items), 1))
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2))
         d.addCallback(lambda items: self.assertEqual(len(items), 2))
         return d
 
@@ -522,26 +522,26 @@
         self.host.profiles[C.PROFILE[0]].roster.addItem(jid.JID(OTHER_PUBLISHER))
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.psclient.publish(
+            lambda __: self.psclient.publish(
                 SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1, COMMENT_2]
             )
         )
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID))
         d.addCallback(lambda items: self.assertEqual(len(items), 1))
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
         d.addCallback(lambda items: self.assertEqual(len(items), 2))
 
         d.addCallback(
-            lambda dummy: self.psclient.publish(SERVICE, OTHER_NODE_ID, [ITEM_2])
+            lambda __: self.psclient.publish(SERVICE, OTHER_NODE_ID, [ITEM_2])
         )
         d.addCallback(
-            lambda dummy: self.psclient.publish(
+            lambda __: self.psclient.publish(
                 SERVICE, COMMENTS_NODE_ID_2, [COMMENT_1, COMMENT_2]
             )
         )
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, OTHER_NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, OTHER_NODE_ID))
         d.addCallback(lambda items: self.assertEqual(len(items), 1))
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2))
         d.addCallback(lambda items: self.assertEqual(len(items), 2))
 
         def clean(res):
@@ -550,17 +550,17 @@
             ]
             return res
 
-        d.addCallback(lambda dummy: self.plugin.deleteAllGroupBlogsComments(C.PROFILE[0]))
+        d.addCallback(lambda __: self.plugin.deleteAllGroupBlogsComments(C.PROFILE[0]))
         d.addCallback(clean)
 
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID))
         d.addCallback(lambda items: self.assertEqual(len(items), 1))
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
         d.addCallback(lambda items: self.assertEqual(len(items), 2))
 
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, OTHER_NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, OTHER_NODE_ID))
         d.addCallback(lambda items: self.assertEqual(len(items), 1))
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2))
         d.addCallback(lambda items: self.assertEqual(len(items), 0))
         return d
 
@@ -569,26 +569,26 @@
         self.host.profiles[C.PROFILE[0]].roster.addItem(jid.JID(OTHER_PUBLISHER))
         d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1])
         d.addCallback(
-            lambda dummy: self.psclient.publish(
+            lambda __: self.psclient.publish(
                 SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1, COMMENT_2]
             )
         )
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID))
         d.addCallback(lambda items: self.assertEqual(len(items), 1))
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
         d.addCallback(lambda items: self.assertEqual(len(items), 2))
 
         d.addCallback(
-            lambda dummy: self.psclient.publish(SERVICE, OTHER_NODE_ID, [ITEM_2])
+            lambda __: self.psclient.publish(SERVICE, OTHER_NODE_ID, [ITEM_2])
         )
         d.addCallback(
-            lambda dummy: self.psclient.publish(
+            lambda __: self.psclient.publish(
                 SERVICE, COMMENTS_NODE_ID_2, [COMMENT_1, COMMENT_2]
             )
         )
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, OTHER_NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, OTHER_NODE_ID))
         d.addCallback(lambda items: self.assertEqual(len(items), 1))
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2))
         d.addCallback(lambda items: self.assertEqual(len(items), 2))
 
         def clean(res):
@@ -598,17 +598,17 @@
             return res
 
         d.addCallback(
-            lambda dummy: self.plugin.deleteAllGroupBlogsAndComments(C.PROFILE[0])
+            lambda __: self.plugin.deleteAllGroupBlogsAndComments(C.PROFILE[0])
         )
         d.addCallback(clean)
 
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID))
         d.addCallback(lambda items: self.assertEqual(len(items), 0))
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1))
         d.addCallback(lambda items: self.assertEqual(len(items), 0))
 
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, OTHER_NODE_ID))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, OTHER_NODE_ID))
         d.addCallback(lambda items: self.assertEqual(len(items), 1))
-        d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2))
+        d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2))
         d.addCallback(lambda items: self.assertEqual(len(items), 0))
         return d