diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/config/tests/test_archivers.py | 6 | ||||
| -rw-r--r-- | src/mailman/model/tests/test_mailinglist.py | 14 | ||||
| -rw-r--r-- | src/mailman/rest/tests/test_lists.py | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/mailman/config/tests/test_archivers.py b/src/mailman/config/tests/test_archivers.py index 322a5040d..b09b89273 100644 --- a/src/mailman/config/tests/test_archivers.py +++ b/src/mailman/config/tests/test_archivers.py @@ -28,11 +28,11 @@ class TestArchivers(unittest.TestCase): layer = ConfigLayer def test_enabled(self): - # By default, the testing configuration enables the archivers. + # By default, the testing configuration enables some archivers. archivers = {} for archiver in config.archivers: archivers[archiver.name] = archiver - self.assertTrue(archivers['prototype'].is_enabled) + self.assertFalse(archivers['prototype'].is_enabled) self.assertTrue(archivers['mail-archive'].is_enabled) self.assertTrue(archivers['mhonarc'].is_enabled) @@ -42,6 +42,6 @@ class TestArchivers(unittest.TestCase): archivers = {} for archiver in config.archivers: archivers[archiver.name] = archiver - self.assertTrue(archivers['prototype'].is_enabled) + self.assertFalse(archivers['prototype'].is_enabled) self.assertTrue(archivers['mail-archive'].is_enabled) self.assertFalse(archivers['mhonarc'].is_enabled) diff --git a/src/mailman/model/tests/test_mailinglist.py b/src/mailman/model/tests/test_mailinglist.py index c9aecc93b..0f37fa2f3 100644 --- a/src/mailman/model/tests/test_mailinglist.py +++ b/src/mailman/model/tests/test_mailinglist.py @@ -108,11 +108,11 @@ class TestListArchiver(unittest.TestCase): def test_get_archiver(self): # Use .get() to see if a mailing list has an archiver. - archiver = self._set.get('prototype') - self.assertEqual(archiver.name, 'prototype') + archiver = self._set.get('mhonarc') + self.assertEqual(archiver.name, 'mhonarc') self.assertTrue(archiver.is_enabled) self.assertEqual(archiver.mailing_list, self._mlist) - self.assertEqual(archiver.system_archiver.name, 'prototype') + self.assertEqual(archiver.system_archiver.name, 'mhonarc') def test_get_archiver_no_such(self): # Using .get() on a non-existing name returns None. @@ -124,15 +124,15 @@ class TestListArchiver(unittest.TestCase): # then the site-wide archiver gets disabled, so the list specific # archiver will also be disabled. archiver_set = IListArchiverSet(self._mlist) - archiver = archiver_set.get('prototype') + archiver = archiver_set.get('mhonarc') self.assertTrue(archiver.is_enabled) # Disable the site-wide archiver. - config.push('enable prototype', """\ - [archiver.prototype] + config.push('enable mhonarc', """\ + [archiver.mhonarc] enable: no """) self.assertFalse(archiver.is_enabled) - config.pop('enable prototype') + config.pop('enable mhonarc') class TestDisabledListArchiver(unittest.TestCase): diff --git a/src/mailman/rest/tests/test_lists.py b/src/mailman/rest/tests/test_lists.py index d83f70058..3bee23314 100644 --- a/src/mailman/rest/tests/test_lists.py +++ b/src/mailman/rest/tests/test_lists.py @@ -32,7 +32,7 @@ from mailman.interfaces.usermanager import IUserManager from mailman.model.mailinglist import AcceptableAlias from mailman.runners.digest import DigestRunner from mailman.testing.helpers import ( - call_api, configuration, get_queue_messages, make_testable_runner, + call_api, get_queue_messages, make_testable_runner, specialized_message_from_string as mfs) from mailman.testing.layers import RESTLayer from mailman.utilities.datetime import now as right_now |