diff options
| author | Joona Hoikkala <joona@kuori.org> | 2018-04-26 12:06:11 +0300 |
|---|---|---|
| committer | Joona Hoikkala <joona@kuori.org> | 2018-04-26 12:06:11 +0300 |
| commit | 887381ea51ab61bd9ea848cc9e21117b516597ad (patch) | |
| tree | 55d3f306fa9ee4a6e3a1d6cbf0a9503fd259d2a3 | |
| parent | a8ef8cda6255abde5c6f5e1bd723efdcd2e9937b (diff) | |
Rename run_renewal_updaters to run_generic_updatersrenew_updates
| -rw-r--r-- | certbot/renewal.py | 2 | ||||
| -rw-r--r-- | certbot/tests/main_test.py | 2 | ||||
| -rw-r--r-- | certbot/tests/renewupdater_test.py | 4 | ||||
| -rw-r--r-- | certbot/updater.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/certbot/renewal.py b/certbot/renewal.py index 57985a8ed..4651eeb36 100644 --- a/certbot/renewal.py +++ b/certbot/renewal.py @@ -428,7 +428,7 @@ def handle_renewal_request(config): renew_skipped.append("%s expires on %s" % (renewal_candidate.fullchain, expiry.strftime("%Y-%m-%d"))) # Run updater interface methods - updater.run_renewal_updaters(lineage_config, plugins, + updater.run_generic_updaters(lineage_config, plugins, renewal_candidate) except Exception as e: # pylint: disable=broad-except diff --git a/certbot/tests/main_test.py b/certbot/tests/main_test.py index 7fa85b30c..0af533f33 100644 --- a/certbot/tests/main_test.py +++ b/certbot/tests/main_test.py @@ -1456,7 +1456,7 @@ class MainTest(test_util.ConfigTestCase): # pylint: disable=too-many-public-met mock_choose.side_effect = errors.PluginSelectionError self.assertRaises(errors.PluginSelectionError, main.renew_cert, None, None, None) - self.assertRaises(errors.PluginSelectionError, updater.run_renewal_updaters, + self.assertRaises(errors.PluginSelectionError, updater.run_generic_updaters, None, None, None) class UnregisterTest(unittest.TestCase): diff --git a/certbot/tests/renewupdater_test.py b/certbot/tests/renewupdater_test.py index 95ab5c378..da243dfce 100644 --- a/certbot/tests/renewupdater_test.py +++ b/certbot/tests/renewupdater_test.py @@ -93,7 +93,7 @@ class RenewUpdaterTest(unittest.TestCase): mock_tls_installer.restart.reset_mock() mock_tls_installer.callcounter.reset_mock() - updater.run_renewal_updaters(config, None, lineage) + updater.run_generic_updaters(config, None, lineage) self.assertFalse(mock_tls_installer.restart.called) # Generic Updater @@ -104,7 +104,7 @@ class RenewUpdaterTest(unittest.TestCase): mock_generic_updater.restart.reset_mock() mock_generic_updater.callcounter.reset_mock() - updater.run_renewal_updaters(config, None, lineage) + updater.run_generic_updaters(config, None, lineage) self.assertEqual(mock_generic_updater.callcounter.call_count, 2) self.assertFalse(mock_generic_updater.restart.called) diff --git a/certbot/updater.py b/certbot/updater.py index c30908a23..5cf9c658b 100644 --- a/certbot/updater.py +++ b/certbot/updater.py @@ -8,7 +8,7 @@ from certbot.plugins import selection as plug_sel logger = logging.getLogger(__name__) -def run_renewal_updaters(config, plugins, lineage): +def run_generic_updaters(config, plugins, lineage): """Run updaters that the plugin supports :param config: Configuration object |