From 35aba14d9797cb5bae7fbdb6ad83c49e01f53684 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Thu, 1 Jun 2017 09:12:50 -0700 Subject: [PATCH] Update in response to changes in #4720. --- certbot-apache/certbot_apache/configurator.py | 2 +- certbot-apache/certbot_apache/tests/configurator_test.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/certbot-apache/certbot_apache/configurator.py b/certbot-apache/certbot_apache/configurator.py index 24a2f3934..097c4ff42 100644 --- a/certbot-apache/certbot_apache/configurator.py +++ b/certbot-apache/certbot_apache/configurator.py @@ -1992,4 +1992,4 @@ def install_ssl_options_conf(options_ssl, options_ssl_digest): # certbot for unprivileged users via setuid), this function will need # to be modified. return common.install_ssl_options_conf(options_ssl, options_ssl_digest, - constants.os_constant("MOD_SSL_CONF_SRC"), constants.ALL_SSL_OPTIONS_HASHES, logger) + constants.os_constant("MOD_SSL_CONF_SRC"), constants.ALL_SSL_OPTIONS_HASHES) diff --git a/certbot-apache/certbot_apache/tests/configurator_test.py b/certbot-apache/certbot_apache/tests/configurator_test.py index 055feeece..db04bfcd1 100644 --- a/certbot-apache/certbot_apache/tests/configurator_test.py +++ b/certbot-apache/certbot_apache/tests/configurator_test.py @@ -1480,7 +1480,7 @@ class InstallSslOptionsConfTest(util.ApacheTest): def test_manually_modified_current_file_does_not_update(self): with open(self.config.mod_ssl_conf, "a") as mod_ssl_conf: mod_ssl_conf.write("a new line for the wrong hash\n") - with mock.patch("certbot_apache.configurator.logger") as mock_logger: + with mock.patch("certbot.plugins.common.logger") as mock_logger: self._call() self.assertFalse(mock_logger.warning.called) self.assertTrue(os.path.isfile(self.config.mod_ssl_conf)) @@ -1494,7 +1494,7 @@ class InstallSslOptionsConfTest(util.ApacheTest): mod_ssl_conf.write("a new line for the wrong hash\n") with open(self.config.updated_mod_ssl_conf_digest, "w") as f: f.write("hashofanoldversion") - with mock.patch("certbot_apache.configurator.logger") as mock_logger: + with mock.patch("certbot.plugins.common.logger") as mock_logger: self._call() self.assertEqual(mock_logger.warning.call_args[0][0], "%s has been manually modified; updated ssl configuration options " @@ -1502,7 +1502,7 @@ class InstallSslOptionsConfTest(util.ApacheTest): self.assertEqual(crypto_util.sha256sum(constants.os_constant("MOD_SSL_CONF_SRC")), self._current_ssl_options_hash()) # only print warning once - with mock.patch("certbot_apache.configurator.logger") as mock_logger: + with mock.patch("certbot.plugins.common.logger") as mock_logger: self._call() self.assertFalse(mock_logger.warning.called)