diff options
| author | Barry Warsaw | 2015-12-16 11:06:53 -0500 |
|---|---|---|
| committer | Barry Warsaw | 2015-12-16 11:06:53 -0500 |
| commit | 80b9617ec1db01e176f2aab9c3c5e35fb2dbcafd (patch) | |
| tree | ffa660d9376e232e60df16863f74792f1e7a2714 /src | |
| parent | 16ef7286bc547d2a63288166628389df7d977da4 (diff) | |
| download | mailman-80b9617ec1db01e176f2aab9c3c5e35fb2dbcafd.tar.gz mailman-80b9617ec1db01e176f2aab9c3c5e35fb2dbcafd.tar.zst mailman-80b9617ec1db01e176f2aab9c3c5e35fb2dbcafd.zip | |
Resolve conflicts.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/model/tests/test_pending.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mailman/model/tests/test_pending.py b/src/mailman/model/tests/test_pending.py index 35eecd5e0..723d27be0 100644 --- a/src/mailman/model/tests/test_pending.py +++ b/src/mailman/model/tests/test_pending.py @@ -55,7 +55,7 @@ class TestPendings(unittest.TestCase): password='xyz') token = pendingdb.add(subscription) self.assertEqual(pendingdb.count, 1) - pendable = pendingdb.confirm(token) + pendingdb.confirm(token) self.assertEqual(pendingdb.count, 0) self.assertEqual(config.db.store.query(PendedKeyValue).count(), 0) @@ -76,7 +76,7 @@ class TestPendings(unittest.TestCase): type='hold request', list_id='list2.example.com') token_1 = pendingdb.add(subscription_1) - token_2 = pendingdb.add(subscription_2) + pendingdb.add(subscription_2) token_3 = pendingdb.add(subscription_3) token_4 = pendingdb.add(subscription_4) self.assertEqual(pendingdb.count, 4) |