upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-09 00:32:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix some bugs & immprove test cases

Browse source
This commit is contained in:
Peter Eckersley 2015-10-18 02:34:24 -07:00
parent 4996e9b678
commit d6345a47c5
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
letsencrypt/cli.py
View file

@ -367,12 +367,13 @@ def choose_configurator_plugins(args, config, plugins, verb):
logger.debug("Requested authenticator %s and installer %s", req_auth, req_inst)
# Try to meet the user's request and/or ask them to pick plugins
authenticator = installer = None
if verb == "run" and req_auth == req_inst:
# Unless the user has explicitly asked for different auth/install,
# only consider offering a single choice
authenticator = installer = display_ops.pick_configurator(config, req_inst, plugins)
else:
if need_inst:
if need_inst or req_inst:
installer = display_ops.pick_installer(config, req_inst, plugins)
if need_auth:
authenticator = display_ops.pick_authenticator(config, req_auth, plugins)

9
letsencrypt/tests/cli_test.py
View file

@ -96,11 +96,12 @@ class CLITest(unittest.TestCase):
def test_configurator_selection(self):
plugins = disco.PluginsRegistry.find_all()
args = ['--agree-eula', '--apache', '--authenticator', 'standalone']
ret, _, _, _ = self._call(args)
if "apache" in plugins:
args = ['--agree-eula', '--apache', '--authenticator', 'standalone']
ret, _, _, _ = self._call(args)
self.assertTrue("Too many flags setting" in ret)
# TODO add tests with a broken plugin, a missing plugin, etc
else:
self.assertTrue("The requested apache plugin does not" in ret)
def test_rollback(self):
_, _, _, client = self._call(['rollback'])
@ -126,7 +127,7 @@ class CLITest(unittest.TestCase):
self.assertEqual(ret, '--domains and --csr are mutually exclusive')
ret, _, _, _ = self._call(['-a', 'bad_auth', 'auth'])
self.assertEqual(ret, 'Authenticator could not be determined')
self.assertEqual(ret, 'The requested bad_auth plugin does not appear to be installed')
@mock.patch('letsencrypt.cli.zope.component.getUtility')
def test_auth_new_request_success(self, mock_get_utility):