From 2e31b1ca4158259c0de5ec5d6804218ee499f156 Mon Sep 17 00:00:00 2001 From: ohemorange Date: Wed, 26 May 2021 14:54:04 -0700 Subject: [PATCH] Remove no names found in configuration files because it sounds like an error but actually it is fine (#8866) * Remove no names found in configuration files because it sounds like an error but actually it is fine * fix test * Pose question more grammatically and specifically, and remove extra space * fix lint Co-authored-by: Alex Zorin --- certbot/certbot/display/ops.py | 6 +++--- certbot/tests/display/ops_test.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/certbot/certbot/display/ops.py b/certbot/certbot/display/ops.py index 04a6e73bb..c2051d3d2 100644 --- a/certbot/certbot/display/ops.py +++ b/certbot/certbot/display/ops.py @@ -123,8 +123,7 @@ def choose_names(installer, question=None): names = get_valid_domains(domains) if not names: - return _choose_names_manually( - "No names were found in your configuration files. ") + return _choose_names_manually() code, names = _filter_names(names, question) if code == display_util.OK and names: @@ -192,7 +191,8 @@ def _choose_names_manually(prompt_prefix=""): """ code, input_ = z_util(interfaces.IDisplay).input( prompt_prefix + - "Please enter in your domain name(s) (comma and/or space separated) ", + "Please enter the domain name(s) you would like on your certificate " + "(comma and/or space separated)", cli_flag="--domains", force_interactive=True) if code == display_util.OK: diff --git a/certbot/tests/display/ops_test.py b/certbot/tests/display/ops_test.py index 5214622fb..ea51effc3 100644 --- a/certbot/tests/display/ops_test.py +++ b/certbot/tests/display/ops_test.py @@ -209,7 +209,6 @@ class ChooseNamesTest(unittest.TestCase): actual_doms = self._call(self.mock_install) self.assertEqual(mock_util().input.call_count, 1) self.assertEqual(actual_doms, [domain]) - self.assertIn("configuration files", mock_util().input.call_args[0][0]) def test_sort_names_trivial(self): from certbot.display.ops import _sort_names