mirror of
https://github.com/certbot/certbot.git
synced 2026-07-28 00:35:50 +02:00
mock get_version in configurator_test
This commit is contained in:
@@ -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.")
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user