From 3f6f267b2ff84fc9799dbddde1fc32301aef3121 Mon Sep 17 00:00:00 2001
From: Erica Portnoy <ebportnoy@gmail.com>
Date: Fri, 20 Mar 2020 16:18:55 -0700
Subject: [PATCH] Reduce warnings while testing by setting mock
 _openssl_version.

---
 certbot-apache/certbot_apache/_internal/configurator.py | 3 ++-
 certbot-apache/tests/configurator_test.py               | 1 +
 certbot-apache/tests/util.py                            | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/certbot-apache/certbot_apache/_internal/configurator.py b/certbot-apache/certbot_apache/_internal/configurator.py
index 088d167bf..c8d55124d 100644
--- a/certbot-apache/certbot_apache/_internal/configurator.py
+++ b/certbot-apache/certbot_apache/_internal/configurator.py
@@ -199,6 +199,7 @@ class ApacheConfigurator(common.Installer):
         """
         version = kwargs.pop("version", None)
         use_parsernode = kwargs.pop("use_parsernode", False)
+        openssl_version = kwargs.pop("openssl_version", None)
         super(ApacheConfigurator, self).__init__(*args, **kwargs)
 
         # Add name_server association dict
@@ -224,7 +225,7 @@ class ApacheConfigurator(common.Installer):
         self.parser = None
         self.parser_root = None
         self.version = version
-        self._openssl_version = None
+        self._openssl_version = openssl_version
         self.vhosts = None
         self.options = copy.deepcopy(self.OS_DEFAULTS)
         self._enhance_func = {"redirect": self._enable_redirect,
diff --git a/certbot-apache/tests/configurator_test.py b/certbot-apache/tests/configurator_test.py
index e42f67e27..f6232a598 100644
--- a/certbot-apache/tests/configurator_test.py
+++ b/certbot-apache/tests/configurator_test.py
@@ -1784,6 +1784,7 @@ class InstallSslOptionsConfTest(util.ApacheTest):
                             "hash of {0} when it is updated.".format(one_file))
 
     def test_openssl_version(self):
+        self.config._openssl_version = None
         some_string_contents = b"""
             SSLOpenSSLConfCmd
             OpenSSL configuration command
diff --git a/certbot-apache/tests/util.py b/certbot-apache/tests/util.py
index ccd0b274d..4994103f3 100644
--- a/certbot-apache/tests/util.py
+++ b/certbot-apache/tests/util.py
@@ -85,7 +85,8 @@ def get_apache_configurator(
         config_dir, work_dir, version=(2, 4, 7),
         os_info="generic",
         conf_vhost_path=None,
-        use_parsernode=False):
+        use_parsernode=False,
+        openssl_version="1.1.1a"):
     """Create an Apache Configurator with the specified options.
 
     :param conf: Function that returns binary paths. self.conf in Configurator
@@ -118,7 +119,8 @@ def get_apache_configurator(
                     except KeyError:
                         config_class = configurator.ApacheConfigurator
                     config = config_class(config=mock_le_config, name="apache",
-                                          version=version, use_parsernode=use_parsernode)
+                                          version=version, use_parsernode=use_parsernode,
+                                          openssl_version=openssl_version)
                     if not conf_vhost_path:
                         config_class.OS_DEFAULTS["vhost_root"] = vhost_path
                     else: