Changeset 8910

Timestamp:

4 Jul 2012, 07:52:21 (12 years ago)

Author:

Henrik Bettermann

Message:

Let removeExpired return the number of deleted mandates.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/mandates

Files:

• container.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• tests.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/mandates/container.py

@@ -41 +41 @@
         """Remove all expired mandates.
         """
+        num_deleted = 0
         for mandate in self.keys():
             if self[mandate].expires < datetime.utcnow():
                 del self[mandate]
-        return
+                num_deleted += 1
+        return num_deleted
 
 class MandatesPlugin(grok.GlobalUtility):

main/waeup.kofa/trunk/src/waeup/kofa/mandates/interfaces.py

@@ -30 +30 @@
 
     def removeExpired():
-        """Remove all expired mandates.
+        """Remove all expired mandates and return the number
+        of successfully removed mandates.
         """
 

main/waeup.kofa/trunk/src/waeup/kofa/mandates/tests.py

@@ -156 +156 @@
         self.app['mandates'].addMandate(mandate2)
         self.assertEqual(len(self.app['mandates'].keys()), 2)
-        self.app['mandates'].removeExpired()
+        num_deleted = self.app['mandates'].removeExpired()
+        self.assertEqual(num_deleted, 1)
         # Only the new mandate remains in the container.
         self.assertEqual(len(self.app['mandates'].keys()), 1)