upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix 'NEXT STEPS' being printed to stdout during -q (#9023)

Browse source 
@osirisinferi noticed [in chat](https://opensource.eff.org/eff-open-source/pl/sa85u4n71tywfpc15c1wu59wae) that "NEXT STEPS:" was ignoring `--quiet` and was being printed unconditionally.

I think it ended up being written this way in #8860 because I was trying not to avoid dumping ANSI escapes and newlines into the log file and confused myself in the process. 

This change makes things a bit more explicit in separating presentation/message.

* fix 'NEXT STEPS' being printed to stdout during -q

* fix tests
This commit is contained in:
alexzorin 2021-09-10 05:10:27 +10:00 committed by GitHub
parent dedd0b84a8
commit d139e26a1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
certbot/certbot/_internal/main.py
View file

@ -526,10 +526,12 @@ def _report_next_steps(config: configuration.NamespaceConfig, installer_err: Opt
return
# TODO: refactor ANSI escapes during https://github.com/certbot/certbot/issues/8848
(bold_on, bold_off) = [c if sys.stdout.isatty() and not config.quiet else '' \
for c in (util.ANSI_SGR_BOLD, util.ANSI_SGR_RESET)]
(bold_on, nl, bold_off) = [c if sys.stdout.isatty() and not config.quiet else '' \
for c in (util.ANSI_SGR_BOLD, '\n', util.ANSI_SGR_RESET)]
print(bold_on, end=nl)
display_util.notify("NEXT STEPS:")
print(bold_off, end='')
print(bold_on, '\n', 'NEXT STEPS:', bold_off, sep='')
for step in steps:
display_util.notify(f"- {step}")

5
certbot/tests/main_test.py
View file

@ -1934,8 +1934,9 @@ class ReportNextStepsTest(unittest.TestCase):
_report_next_steps(*args, **kwargs)
def _output(self) -> str:
self.mock_notify.assert_called_once()
return self.mock_notify.call_args_list[0][0][0]
self.assertEqual(self.mock_notify.call_count, 2)
self.assertEqual(self.mock_notify.call_args_list[0][0][0], 'NEXT STEPS:')
return self.mock_notify.call_args_list[1][0][0]
def test_report(self):
"""No steps for a normal renewal"""