rebase, fix tests, remove code_analysis warnings

collective · Feb 19, 2015 · 293012f · 293012f
1 parent 18eff55
commit 293012f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/collective/solr/browser/maintenance.py b/src/collective/solr/browser/maintenance.py
@@ -145,9 +145,9 @@ def checkPoint():
                    obj.portal_type in ignore_portal_types:
                     continue
 
-                if (only_portal_types and \
-                    obj.portal_type in only_portal_types) or \
-                    not only_portal_types:
+                if (only_portal_types and
+                        obj.portal_type in only_portal_types) or \
+                        not only_portal_types:
 
                     data, missing = proc.getData(obj)
                     prepareData(data)

diff --git a/src/collective/solr/tests/test_server.py b/src/collective/solr/tests/test_server.py
@@ -154,51 +154,51 @@ def testReindexPortalTypesParameters(self):
         # initially the solr index should be empty
         self.assertEqual(numFound(self.search()), 0)
 
-        ## first test the only_portal_types parameter
+        # first test the only_portal_types parameter
         maintenance.reindex(only_portal_types=[])
         self.assertEqual(numFound(self.search()), 8)
         maintenance.clear()
 
         maintenance.reindex(only_portal_types=['Folder'])
-        self.assertEqual(numFound(self.search()), 4)
+        self.assertEqual(numFound(self.search()), 5)
         maintenance.clear()
 
         maintenance.reindex(only_portal_types=['Folder', 'Collection'])
-        self.assertEqual(numFound(self.search()), 6)
+        self.assertEqual(numFound(self.search()), 7)
         maintenance.clear()
 
         maintenance.reindex(
             only_portal_types=['Folder', 'Collection', 'NotExistingPortalType']
         )
-        self.assertEqual(numFound(self.search()), 6)
+        self.assertEqual(numFound(self.search()), 7)
         maintenance.clear()
 
-        ## then the ignore_portal_types
+        # then the ignore_portal_types
         maintenance.reindex(ignore_portal_types=[])
         self.assertEqual(numFound(self.search()), 8)
         maintenance.clear()
 
         maintenance.reindex(ignore_portal_types=['Folder'])
-        self.assertEqual(numFound(self.search()), 4)
+        self.assertEqual(numFound(self.search()), 3)
         maintenance.clear()
 
         maintenance.reindex(ignore_portal_types=['Folder', 'Collection'])
-        self.assertEqual(numFound(self.search()), 2)
+        self.assertEqual(numFound(self.search()), 1)
         maintenance.clear()
 
         maintenance.reindex(
             ignore_portal_types=['Folder', 'Collection',
                                  'NotExistingPortalType']
         )
-        self.assertEqual(numFound(self.search()), 2)
+        self.assertEqual(numFound(self.search()), 1)
         maintenance.clear()
 
-        ## and then both, which is not supported
+        # and then both, which is not supported
         msg = maintenance.reindex(ignore_portal_types=['Collection'],
                                   only_portal_types=['Folder'])
         self.assertEquals(
             msg,
-            'It is not possible to combine ignore_portal_types with ' \
+            'It is not possible to combine ignore_portal_types with '
             'only_portal_types')
 
     def testPartialReindex(self):