fix log and AT test

collective · Jul 24, 2016 · fc23322 · fc23322
1 parent 98ee713
commit fc23322
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/collective/solr/browser/maintenance.py b/src/collective/solr/browser/maintenance.py
@@ -355,8 +355,8 @@ def cleanup(self, batch=1000):
                     deleted += 1
                     continue
                 if ob is None:
-                    log('Object not found, removing: %s (%s)\n' % (
-                        flare['path_string'], err))
+                    log('Object not found, removing: %s\n' % (
+                        flare['path_string']))
                     conn.delete(flare[key])
                     deleted += 1
                     continue

diff --git a/src/collective/solr/tests/test_server.py b/src/collective/solr/tests/test_server.py
@@ -1352,15 +1352,28 @@ def testCleanup_removed(self):
     def testCleanup_uid(self):
         self.maintenance.reindex()
         # low level delete to force ascync index and
+        from Products.Archetypes.config import UUID_ATTR
         from plone.uuid.interfaces import ATTRIBUTE_NAME
         from plone.uuid.interfaces import IUUID
         uuid_orig = IUUID(self.portal['news'])
 
+        # Dexterity
         setattr(self.portal['news'], ATTRIBUTE_NAME, 'test-solr-uid')
+        # Archetypes
+        setattr(self.portal['news'], UUID_ATTR, 'test-solr-uid')
         resp = self.search('NewsFolder')
         self.assertEqual(len(resp), 1)
         self.assertEqual(resp.results()[0]['UID'], uuid_orig)
         self.maintenance.cleanup()
         resp = self.search('NewsFolder')
         # NewsFolder was removed from index too
         self.assertEqual(resp.results()[0]['UID'], 'test-solr-uid')
+
+    def testOptimize(self):
+        """ Test call to optimze works
+
+            There is nothing more to check
+        """
+        self.maintenance.reindex()
+        self.maintenance.optimize()
+        self.assertTrue(True)