Merge lp:~abompard/mailman/subpolicy into lp:~barry/mailman/subpolicy-2

[Aurélien Bompard]

A couple of minor changes. The rest looks good, but I have questions on the "self.token" value that we need to generate for the SubscriptionWorkflow class.

[Barry Warsaw (barry)]

Thanks, but I think this isn't relevant to the current state of the branch.

review: Disapprove

Unmerged revisions

7329. By Aurelien Bompard <email address hidden> on 2015-04-10

Make sure stored state is deleted after restoring

7328. By Aurelien Bompard <email address hidden> on 2015-04-10

Fix a failing test

=== modified file 'src/mailman/app/subscriptions.py'
--- src/mailman/app/subscriptions.py	2015-04-10 02:44:42 +0000
+++ src/mailman/app/subscriptions.py	2015-04-10 23:32:59 +0000
@@ -164,7 +164,7 @@
         hold_subscription(self.mlist, request)
 
     def _step_send_confirmation(self):
-        self._next.append('moderation_check')
+        self._next.append('moderation_checks')
         self.save()
         self._next.clear() # stop iteration until we get confirmation
         # XXX: create the Pendable, send the ConfirmationNeededEvent
 
=== modified file 'src/mailman/app/tests/test_subscriptions.py'
--- src/mailman/app/tests/test_subscriptions.py	2015-04-10 02:44:42 +0000
+++ src/mailman/app/tests/test_subscriptions.py	2015-04-10 23:32:59 +0000
@@ -372,7 +372,6 @@
             SubscriptionPolicy.confirm_then_moderate
         _do_check()
 
-    @unittest.expectedFailure
     def test_confirmation_required(self):
         # Tests subscriptions where user confirmation is required
         self._mlist.subscription_policy = \
 
=== modified file 'src/mailman/model/tests/test_workflow.py'
--- src/mailman/model/tests/test_workflow.py	2015-03-29 21:14:09 +0000
+++ src/mailman/model/tests/test_workflow.py	2015-04-10 23:32:59 +0000
@@ -24,6 +24,7 @@
 
 import unittest
 
+from mailman.config import config
 from mailman.interfaces.workflow import IWorkflowStateManager
 from mailman.testing.layers import ConfigLayer
 from zope.component import getUtility
@@ -108,3 +109,12 @@
         self._manager.save(name, key)
         workflow = self._manager.restore('ewe', 'fly')
         self.assertIsNone(workflow)
+
+    def test_restore_cleanup(self):
+        # After restoring, stale data must be deleted from the database
+        name = 'ant'
+        key = 'bee'
+        self._manager.save(name, key)
+        self.assertIsNotNone(self._manager.restore(name, key))
+        config.db.store.flush() # there's some caching involved
+        self.assertIsNone(self._manager.restore(name, key))
 
=== modified file 'src/mailman/model/workflow.py'
--- src/mailman/model/workflow.py	2015-03-29 21:14:09 +0000
+++ src/mailman/model/workflow.py	2015-04-10 23:32:59 +0000
@@ -62,4 +62,7 @@
     @dbconnection
     def restore(self, store, name, key):
         """See `IWorkflowStateManager`."""
-        return store.query(WorkflowState).get((name, key))
+        state = store.query(WorkflowState).get((name, key))
+        if state is not None:
+            store.delete(state)
+        return state