From 83966cdfcf97032ab026e4d99aa55f1fb5df44d2 Mon Sep 17 00:00:00 2001 From: Craig Smith Date: Wed, 30 Nov 2016 10:23:06 +0930 Subject: [PATCH] Fixed output (#3637). (#3809) --- certbot/cli.py | 1 + certbot/tests/cli_test.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/certbot/cli.py b/certbot/cli.py index fa3bcc48b..d327240f4 100644 --- a/certbot/cli.py +++ b/certbot/cli.py @@ -335,6 +335,7 @@ class HelpfulArgumentParser(object): self.help_topics = HELP_TOPICS + plugin_names + [None] usage, short_usage = usage_strings(plugins) self.parser = configargparse.ArgParser( + prog="certbot", usage=short_usage, formatter_class=argparse.ArgumentDefaultsHelpFormatter, args_for_setting_config_path=["-c", "--config"], diff --git a/certbot/tests/cli_test.py b/certbot/tests/cli_test.py index 8d4d0af62..54ae74f95 100644 --- a/certbot/tests/cli_test.py +++ b/certbot/tests/cli_test.py @@ -143,6 +143,21 @@ class CLITest(unittest.TestCase): # pylint: disable=too-many-public-methods out = self._help_output(['-h']) self.assertTrue(cli.usage_strings(plugins)[0] in out) + def test_version_string_program_name(self): + toy_out = six.StringIO() + toy_err = six.StringIO() + with mock.patch('certbot.main.sys.stdout', new=toy_out): + with mock.patch('certbot.main.sys.stderr', new=toy_err): + try: + main.main(["--version"]) + except SystemExit: + pass + finally: + output = toy_out.getvalue() or toy_err.getvalue() + self.assertTrue("certbot" in output, "Output is {0}".format(output)) + toy_out.close() + toy_err.close() + def _cli_missing_flag(self, args, message): "Ensure that a particular error raises a missing cli flag error containing message" exc = None