crypt/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-01-21 19:01:07 +03:00
Code Activity

Added additional errors to IPlugin.prepare interface

Browse Source
This commit is contained in:
James Kasten
2015-07-31 10:44:21 -07:00
parent 06a014de09
commit 33111e1ce6
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
letsencrypt-nginx/letsencrypt_nginx/configurator.py
View File

@@ -444,7 +444,7 @@ class NginxConfigurator(common.Plugin):
# nginx < 0.8.48 uses machine hostname as default server_name instead of
# the empty string
if nginx_version < (0, 8, 48):
raise errors.PluginError("Nginx version must be 0.8.48+")
raise errors.NotSupportedError("Nginx version must be 0.8.48+")
return nginx_version

2
letsencrypt-nginx/letsencrypt_nginx/tests/configurator_test.py
View File

@@ -249,7 +249,7 @@ class NginxConfiguratorTest(util.NginxTest):
" (based on LLVM 3.5svn)",
"TLS SNI support enabled",
"configure arguments: --with-http_ssl_module"]))
self.assertRaises(errors.PluginError, self.config.get_version)
self.assertRaises(errors.NotSupportedError, self.config.get_version)
mock_popen.side_effect = OSError("Can't find program")
self.assertRaises(errors.PluginError, self.config.get_version)

19
letsencrypt/interfaces.py
View File

@@ -102,14 +102,19 @@ class IPlugin(zope.interface.Interface):
def prepare():
"""Prepare the plugin.
Finish up any additional initialization.
Finish up any additional initialization.
:raises .MisconfigurationError:
when full initialization cannot be completed. Plugin will
be displayed on a list of available plugins.
:raises .NoInstallationError:
when the necessary programs/files cannot be located. Plugin
will NOT be displayed on a list of available plugins.
:raises .PluginError:
when full initialization cannot be completed.
:raises .MisconfigurationError:
when full initialization cannot be completed. Plugin will
be displayed on a list of available plugins.
:raises .NoInstallationError:
when the necessary programs/files cannot be located. Plugin
will NOT be displayed on a list of available plugins.
:raises .NotSupportedError:
when the installation is recognized, but the version is not
currently supported.
"""