3 files changed, 38 insertions, 33 deletions
diff --git a/src/mailman/model/tests/test_usermanager.py b/src/mailman/model/tests/test_usermanager.py
index 31f1a7275..e441ed713 100644
--- a/src/mailman/model/tests/test_usermanager.py
+++ b/src/mailman/model/tests/test_usermanager.py
@@ -80,3 +80,8 @@ class TestUserManager(unittest.TestCase):
         user = self._usermanager.create_user('anne@example.com', 'Anne Person')
         other_user = self._usermanager.make_user('anne@example.com')
         self.assertIs(user, other_user)
+
+    def test_get_user_by_id(self):
+        original = self._usermanager.make_user('anne@example.com')
+        copy = self._usermanager.get_user_by_id(original.user_id)
+        self.assertEqual(original, copy)
diff --git a/src/mailman/model/tests/test_workflow.py b/src/mailman/model/tests/test_workflow.py
index b5e915df4..6081e5b57 100644
--- a/src/mailman/model/tests/test_workflow.py
+++ b/src/mailman/model/tests/test_workflow.py
@@ -39,72 +39,72 @@ class TestWorkflow(unittest.TestCase):
     def test_save_restore_workflow(self):
         # Save and restore a workflow.
         name = 'ant'
-        key = 'bee'
+        token = 'bee'
         step = 'cat'
         data = 'dog'
-        self._manager.save(name, key, step, data)
-        workflow = self._manager.restore(name, key)
+        self._manager.save(name, token, step, data)
+        workflow = self._manager.restore(name, token)
         self.assertEqual(workflow.name, name)
-        self.assertEqual(workflow.key, key)
+        self.assertEqual(workflow.token, token)
         self.assertEqual(workflow.step, step)
         self.assertEqual(workflow.data, data)
 
     def test_save_restore_workflow_without_step(self):
         # Save and restore a workflow that contains no step.
         name = 'ant'
-        key = 'bee'
+        token = 'bee'
         data = 'dog'
-        self._manager.save(name, key, data=data)
-        workflow = self._manager.restore(name, key)
+        self._manager.save(name, token, data=data)
+        workflow = self._manager.restore(name, token)
         self.assertEqual(workflow.name, name)
-        self.assertEqual(workflow.key, key)
+        self.assertEqual(workflow.token, token)
         self.assertIsNone(workflow.step)
         self.assertEqual(workflow.data, data)
 
     def test_save_restore_workflow_without_data(self):
         # Save and restore a workflow that contains no data.
         name = 'ant'
-        key = 'bee'
+        token = 'bee'
         step = 'cat'
-        self._manager.save(name, key, step)
-        workflow = self._manager.restore(name, key)
+        self._manager.save(name, token, step)
+        workflow = self._manager.restore(name, token)
         self.assertEqual(workflow.name, name)
-        self.assertEqual(workflow.key, key)
+        self.assertEqual(workflow.token, token)
         self.assertEqual(workflow.step, step)
         self.assertIsNone(workflow.data)
 
     def test_save_restore_workflow_without_step_or_data(self):
         # Save and restore a workflow that contains no step or data.
         name = 'ant'
-        key = 'bee'
-        self._manager.save(name, key)
-        workflow = self._manager.restore(name, key)
+        token = 'bee'
+        self._manager.save(name, token)
+        workflow = self._manager.restore(name, token)
         self.assertEqual(workflow.name, name)
-        self.assertEqual(workflow.key, key)
+        self.assertEqual(workflow.token, token)
         self.assertIsNone(workflow.step)
         self.assertIsNone(workflow.data)
 
     def test_restore_workflow_with_no_matching_name(self):
         # Try to restore a workflow that has no matching name in the database.
         name = 'ant'
-        key = 'bee'
-        self._manager.save(name, key)
-        workflow = self._manager.restore('ewe', key)
+        token = 'bee'
+        self._manager.save(name, token)
+        workflow = self._manager.restore('ewe', token)
         self.assertIsNone(workflow)
 
-    def test_restore_workflow_with_no_matching_key(self):
-        # Try to restore a workflow that has no matching key in the database.
+    def test_restore_workflow_with_no_matching_token(self):
+        # Try to restore a workflow that has no matching token in the database.
         name = 'ant'
-        key = 'bee'
-        self._manager.save(name, key)
+        token = 'bee'
+        self._manager.save(name, token)
         workflow = self._manager.restore(name, 'fly')
         self.assertIsNone(workflow)
 
-    def test_restore_workflow_with_no_matching_key_or_name(self):
-        # Try to restore a workflow that has no matching key or name in the
+    def test_restore_workflow_with_no_matching_token_or_name(self):
+        # Try to restore a workflow that has no matching token or name in the
         # database.
         name = 'ant'
-        key = 'bee'
-        self._manager.save(name, key)
+        token = 'bee'
+        self._manager.save(name, token)
         workflow = self._manager.restore('ewe', 'fly')
         self.assertIsNone(workflow)
diff --git a/src/mailman/model/workflow.py b/src/mailman/model/workflow.py
index 53c9f05ea..d9f23f53b 100644
--- a/src/mailman/model/workflow.py
+++ b/src/mailman/model/workflow.py
@@ -38,7 +38,7 @@ class WorkflowState(Model):
     __tablename__ = 'workflowstate'
 
     name = Column(Unicode, primary_key=True)
-    key = Column(Unicode, primary_key=True)
+    token = Column(Unicode, primary_key=True)
     step = Column(Unicode)
     data = Column(Unicode)
 
@@ -49,17 +49,17 @@ class WorkflowStateManager:
     """See `IWorkflowStateManager`."""
 
     @dbconnection
-    def save(self, store, name, key, step=None, data=None):
+    def save(self, store, name, token, step=None, data=None):
         """See `IWorkflowStateManager`."""
-        state = store.query(WorkflowState).get((name, key))
+        state = store.query(WorkflowState).get((name, token))
         if state is None:
-            state = WorkflowState(name=name, key=key, step=step, data=data)
+            state = WorkflowState(name=name, token=token, step=step, data=data)
             store.add(state)
         else:
             state.step = step
             state.data = data
 
     @dbconnection
-    def restore(self, store, name, key):
+    def restore(self, store, name, token):
         """See `IWorkflowStateManager`."""
-        return store.query(WorkflowState).get((name, key))
+        return store.query(WorkflowState).get((name, token))