crypt/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-01-26 07:41:33 +03:00
Code Activity

Thorough checking, less printfs

Browse Source
This commit is contained in:
Peter Eckersley
2016-02-03 13:29:13 -08:00
parent 56f4b4d534
commit fd0fd1444d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
letsencrypt/cli.py
View File

@@ -283,16 +283,14 @@ def _should_renew(config, lineage):
"Return true if any of the circumstances for automatic renewal apply."
if config.renew_by_default:
logger.info("Auto-renewal forced with --renew-by-default...")
print("forced")
return True
if lineage.should_autorenew(interactive=True):
logger.info("Cert is due for renewal, auto-renewing...")
print("due")
return True
if config.dry_run:
logger.info("Cert not due for renewal, but simulating renewal for dry run")
print("dry")
return True
logger.info("Cert not yet due for renewal")
return False

6
letsencrypt/tests/cli_test.py
View File

@@ -573,13 +573,15 @@ class CLITest(unittest.TestCase): # pylint: disable=too-many-public-methods
def test_certonly_renewal_triggers(self):
# --dry-run should force renewal
_, get_utility = self._test_renewal_common(False, ['--dry-run'], None)
_, get_utility = self._test_renewal_common(False, ['--dry-run'], "simulating renewal")
self.assertEqual(get_utility().add_message.call_count, 1)
self.assertTrue('dry run' in get_utility().add_message.call_args[0][0])
_, _ = self._test_renewal_common(False, ['--renew-by-default', '-tvv', '--debug'], "Auto-renewal forced")
_, _ = self._test_renewal_common(False, ['--renew-by-default', '-tvv', '--debug'],
"Auto-renewal forced")
self.assertEqual(get_utility().add_message.call_count, 1)
@mock.patch('letsencrypt.cli.zope.component.getUtility')
@mock.patch('letsencrypt.cli._treat_as_renewal')
@mock.patch('letsencrypt.cli._init_le_client')