1 files changed, 25 insertions, 53 deletions

diff --git a/src/mailman/model/tests/test_workflow.py b/src/mailman/model/tests/test_workflow.py
index ee14f17a7..6aade980b 100644
--- a/src/mailman/model/tests/test_workflow.py
+++ b/src/mailman/model/tests/test_workflow.py
@@ -32,116 +32,88 @@ class TestWorkflow(unittest.TestCase):
 
     def test_save_restore_workflow(self):
         # Save and restore a workflow.
-        name = 'ant'
         token = 'bee'
         step = 'cat'
         data = 'dog'
-        self._manager.save(name, token, step, data)
-        state = self._manager.restore(name, token)
-        self.assertEqual(state.name, name)
+        self._manager.save(token, step, data)
+        state = self._manager.restore(token)
         self.assertEqual(state.token, token)
         self.assertEqual(state.step, step)
         self.assertEqual(state.data, data)
 
     def test_save_restore_workflow_without_step(self):
         # Save and restore a workflow that contains no step.
-        name = 'ant'
         token = 'bee'
         data = 'dog'
-        self._manager.save(name, token, data=data)
-        state = self._manager.restore(name, token)
-        self.assertEqual(state.name, name)
+        self._manager.save(token, data=data)
+        state = self._manager.restore(token)
         self.assertEqual(state.token, token)
         self.assertIsNone(state.step)
         self.assertEqual(state.data, data)
 
     def test_save_restore_workflow_without_data(self):
         # Save and restore a workflow that contains no data.
-        name = 'ant'
         token = 'bee'
         step = 'cat'
-        self._manager.save(name, token, step)
-        state = self._manager.restore(name, token)
-        self.assertEqual(state.name, name)
+        self._manager.save(token, step)
+        state = self._manager.restore(token)
         self.assertEqual(state.token, token)
         self.assertEqual(state.step, step)
         self.assertIsNone(state.data)
 
     def test_save_restore_workflow_without_step_or_data(self):
         # Save and restore a workflow that contains no step or data.
-        name = 'ant'
         token = 'bee'
-        self._manager.save(name, token)
-        state = self._manager.restore(name, token)
-        self.assertEqual(state.name, name)
+        self._manager.save(token)
+        state = self._manager.restore(token)
         self.assertEqual(state.token, token)
         self.assertIsNone(state.step)
         self.assertIsNone(state.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'
-        token = 'bee'
-        self._manager.save(name, token)
-        state = self._manager.restore('ewe', token)
-        self.assertIsNone(state)
-
     def test_restore_workflow_with_no_matching_token(self):
         # Try to restore a workflow that has no matching token in the database.
-        name = 'ant'
-        token = 'bee'
-        self._manager.save(name, token)
-        state = self._manager.restore(name, 'fly')
-        self.assertIsNone(state)
-
-    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'
         token = 'bee'
-        self._manager.save(name, token)
-        state = self._manager.restore('ewe', 'fly')
+        self._manager.save(token)
+        state = self._manager.restore('fly')
         self.assertIsNone(state)
 
     def test_restore_removes_record(self):
-        name = 'ant'
         token = 'bee'
         self.assertEqual(self._manager.count, 0)
-        self._manager.save(name, token)
+        self._manager.save(token)
         self.assertEqual(self._manager.count, 1)
-        self._manager.restore(name, token)
+        self._manager.restore(token)
         self.assertEqual(self._manager.count, 0)
 
     def test_save_after_restore(self):
-        name = 'ant'
         token = 'bee'
         self.assertEqual(self._manager.count, 0)
-        self._manager.save(name, token)
+        self._manager.save(token)
         self.assertEqual(self._manager.count, 1)
-        self._manager.restore(name, token)
+        self._manager.restore(token)
         self.assertEqual(self._manager.count, 0)
-        self._manager.save(name, token)
+        self._manager.save(token)
         self.assertEqual(self._manager.count, 1)
 
     def test_discard(self):
         # Discard some workflow state.  This is use by
         # ISubscriptionManager.discard().
-        self._manager.save('ant', 'token', 'one')
-        self._manager.save('bee', 'token', 'two')
-        self._manager.save('ant', 'nekot', 'three')
-        self._manager.save('bee', 'nekot', 'four')
+        self._manager.save('token1', 'one')
+        self._manager.save('token2', 'two')
+        self._manager.save('token3', 'three')
+        self._manager.save('token4', 'four')
         self.assertEqual(self._manager.count, 4)
-        self._manager.discard('bee', 'token')
+        self._manager.discard('token2')
         self.assertEqual(self._manager.count, 3)
-        state = self._manager.restore('ant', 'token')
+        state = self._manager.restore('token1')
         self.assertEqual(state.step, 'one')
-        state = self._manager.restore('bee', 'token')
+        state = self._manager.restore('token2')
         self.assertIsNone(state)
-        state = self._manager.restore('ant', 'nekot')
+        state = self._manager.restore('token3')
         self.assertEqual(state.step, 'three')
-        state = self._manager.restore('bee', 'nekot')
+        state = self._manager.restore('token4')
         self.assertEqual(state.step, 'four')
 
     def test_discard_missing_workflow(self):
-        self._manager.discard('bogus-name', 'bogus-token')
+        self._manager.discard('bogus-token')
         self.assertEqual(self._manager.count, 0)