From f285f3947db54ecb473e15cb152fe402d9b146c6 Mon Sep 17 00:00:00 2001 From: sagi Date: Wed, 2 Dec 2015 22:00:07 +0000 Subject: [PATCH] mock get_version in configurator_test --- letsencrypt-apache/letsencrypt_apache/configurator.py | 6 +++--- .../letsencrypt_apache/tests/configurator_test.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/letsencrypt-apache/letsencrypt_apache/configurator.py index 90f1ed850..8864a5c65 100644 --- a/letsencrypt-apache/letsencrypt_apache/configurator.py +++ b/letsencrypt-apache/letsencrypt_apache/configurator.py @@ -885,14 +885,14 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): # even with save() and load() self.parser.add_dir(general_vh.path, "RewriteEngine", "on") - if self.get_version >= (2.3.9): + if self.get_version() >= (2, 3, 9): self.parser.add_dir(general_vh.path, "RewriteRule", constants.REWRITE_HTTPS_ARGS_WITH_END) - else: + else: self.parser.add_dir(general_vh.path, "RewriteRule", constants.REWRITE_HTTPS_ARGS) - if _is_rewrite_exists(vhost): + if self._is_rewrite_exists(ssl_vhost): logger.warn("Preexisting rewrite rules were detected. " "Please verify that the newly installed " "redirection rewrite rule doesn't break anything.") diff --git a/letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py b/letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py index ea282d24e..4cce205dc 100644 --- a/letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py +++ b/letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py @@ -713,6 +713,7 @@ class TwoVhost80Test(util.ApacheTest): def test_redirect_well_formed_http(self, mock_exe, _): self.config.parser.update_runtime_variables = mock.Mock() mock_exe.return_value = True + self.config.get_version = mock.Mock(return_value=(2, 3, 9)) # This will create an ssl vhost for letsencrypt.demo self.config.enhance("letsencrypt.demo", "redirect") @@ -746,6 +747,8 @@ class TwoVhost80Test(util.ApacheTest): def test_redirect_twice(self): # Skip the enable mod self.config.parser.modules.add("rewrite_module") + self.config.get_version = mock.Mock(return_value=(2, 3, 9)) + self.config.enhance("encryption-example.demo", "redirect") self.assertRaises( errors.PluginEnhancementAlreadyPresent,