Use common installer base

This commit is contained in:
Brad Warren 2017-08-25 11:41:30 -07:00
parent 60c6cc5f2a
commit 0f4c5c2305
2 changed files with 4 additions and 22 deletions

View file

@ -21,7 +21,7 @@ logger = logging.getLogger(__name__)
@zope.interface.implementer(interfaces.IInstaller)
@zope.interface.provider(interfaces.IPluginFactory)
class Installer(plugins_common.Plugin):
class Installer(plugins_common.Installer):
"""Certbot installer plugin for Postfix."""
description = "Configure TLS with the Postfix MTA"
@ -278,24 +278,6 @@ class Installer(plugins_common.Plugin):
"""
self.maybe_add_config_lines()
def rollback_checkpoints(self, rollback=1):
"""Revert `rollback` number of configuration checkpoints.
:raises .PluginError: when configuration cannot be fully reverted
"""
def recovery_routine(self):
"""Revert configuration to most recent finalized checkpoint.
Remove all changes (temporary and permanent) that have not been
finalized. This is useful to protect against crashes and other
execution interruptions.
:raises .errors.PluginError: If unable to recover the configuration
"""
def view_config_changes(self):
"""Display all of the LE config changes.
:raises .PluginError: when config changes cannot be parsed
"""
def config_test(self):
"""Make sure the configuration is valid.
:raises .MisconfigurationError: when the config is not in a usable state

View file

@ -24,12 +24,12 @@ myhostname = mail.fubard.org
myorigin = fubard.org"""
class InstallerTest(certbot_test_util.TempDirTestCase):
class InstallerTest(certbot_test_util.ConfigTestCase):
def setUp(self):
super(InstallerTest, self).setUp()
self.config = mock.MagicMock(postfix_config_dir=self.tempdir,
postfix_config_utility="postconf")
self.config.postfix_config_dir = self.tempdir
self.config.postfix_config_utility = "postconf"
def test_add_parser_arguments(self):
mock_add = mock.MagicMock()