starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 00:22:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate route53 options (#6405)

Browse Source 
* Remove duplicate route53 options

Duplicate route53 option (certbot-route53:auth) removed.

* Remove duplicate route53 options from help

Removed duplicate route53 options from help by adding a couple of if statements in cli.py.

* Fix formatting

* Use cleaner solution to remove duplicate route53 options from help

Used a cleaner method to remove the duplicate option from the help text

* Fix line too long

* Add regression test

Added a regression test and fixed a couple of minor issues.

* Fix trailing whitespace

* Add missing newline

* Put newline in correct place
This commit is contained in:
Oshawk
2018-12-03 15:32:47 -08:00
committed by ohemorange
parent 1f4297d0ed
commit d30afbea57
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot/cli.py
+3 -1
View File
@@ -859,7 +859,9 @@ class HelpfulArgumentParser(object):
if chosen_topic == "everything": if chosen_topic == "everything":
chosen_topic = "run" chosen_topic = "run"
if chosen_topic == "all": if chosen_topic == "all":
return dict([(t, True) for t in self.help_topics]) # Addition of condition closes #6209 (removal of duplicate route53 option).
return dict([(t, True) if t != 'certbot-route53:auth' else (t, False)
for t in self.help_topics])
elif not chosen_topic: elif not chosen_topic:
return dict([(t, False) for t in self.help_topics]) return dict([(t, False) for t in self.help_topics])
else: else:
certbot/tests/cli_test.py
+5
View File
@@ -431,6 +431,11 @@ class ParseTest(unittest.TestCase): # pylint: disable=too-many-public-methods
self.assertRaises(errors.Error, self.parse, self.assertRaises(errors.Error, self.parse,
"--allow-subset-of-names -d *.example.org".split()) "--allow-subset-of-names -d *.example.org".split())
def test_route53_no_revert(self):
for help_flag in ['-h', '--help']:
for topic in ['all', 'plugins', 'dns-route53']:
self.assertFalse('certbot-route53:auth' in self._help_output([help_flag, topic]))
class DefaultTest(unittest.TestCase): class DefaultTest(unittest.TestCase):
"""Tests for certbot.cli._Default.""" """Tests for certbot.cli._Default."""