Remove a bit of nginx code dedup from apache

letsencrypt/client/plugins/apache/tests/util.py

@@ -20,7 +20,7 @@ class ApacheTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
         self.temp_dir, self.config_dir, self.work_dir = dir_setup(
             "debian_apache_2_4/two_vhost_80")
 
-        self.ssl_options = setup_apache_ssl_options(self.config_dir)
+        self.ssl_options = setup_ssl_options(self.config_dir)
 
         self.config_path = os.path.join(
             self.temp_dir, "debian_apache_2_4/two_vhost_80/apache2")
@@ -31,7 +31,8 @@ class ApacheTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
             "letsencrypt.acme.jose", "testdata/rsa256_key.pem")
 
 
-def dir_setup(test_dir="debian_apache_2_4/two_vhost_80"):
+def dir_setup(test_dir="debian_apache_2_4/two_vhost_80",
+              pkg="letsencrypt.client.plugins.apache.tests"):
     """Setup the directories necessary for the configurator."""
     temp_dir = tempfile.mkdtemp("temp")
     config_dir = tempfile.mkdtemp("config")
@@ -42,7 +43,7 @@ def dir_setup(test_dir="debian_apache_2_4/two_vhost_80"):
     os.chmod(work_dir, constants.CONFIG_DIRS_MODE)
 
     test_configs = pkg_resources.resource_filename(
-        "letsencrypt.client.plugins.apache.tests", "testdata/%s" % test_dir)
+        pkg, os.path.join("testdata", test_dir))
 
     shutil.copytree(
         test_configs, os.path.join(temp_dir, test_dir), symlinks=True)
@@ -50,10 +51,11 @@ def dir_setup(test_dir="debian_apache_2_4/two_vhost_80"):
     return temp_dir, config_dir, work_dir
 
 
-def setup_apache_ssl_options(config_dir):
+def setup_ssl_options(
+        config_dir, mod_ssl_conf=constants.APACHE_MOD_SSL_CONF):
     """Move the ssl_options into position and return the path."""
     option_path = os.path.join(config_dir, "options-ssl.conf")
-    shutil.copyfile(constants.APACHE_MOD_SSL_CONF, option_path)
+    shutil.copyfile(mod_ssl_conf, option_path)
     return option_path
 
 

letsencrypt/client/plugins/nginx/tests/parser_test.py

@@ -24,8 +24,8 @@ class NginxParserTest(util.NginxTest):
         shutil.rmtree(self.work_dir)
 
     def test_root_normalized(self):
-        path = os.path.join(self.temp_dir, "foo/////"
-                            "bar/../../testdata")
+        path = os.path.join(self.temp_dir, "etc_nginx/////"
+                            "ubuntu_nginx/../../etc_nginx")
         nparser = parser.NginxParser(path, None)
         self.assertEqual(nparser.root, self.config_path)
 

letsencrypt/client/plugins/nginx/tests/util.py

@@ -1,13 +1,13 @@
 """Common utilities for letsencrypt.client.nginx."""
 import os
 import pkg_resources
-import shutil
-import tempfile
 import unittest
 
 import mock
 
 from letsencrypt.client import constants
+
+from letsencrypt.client.plugins.apache.tests import util as apache_util
 from letsencrypt.client.plugins.nginx import configurator
 
 
@@ -16,13 +16,13 @@ class NginxTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
     def setUp(self):
         super(NginxTest, self).setUp()
 
-        self.temp_dir, self.config_dir, self.work_dir = dir_setup(
-            "testdata")
+        self.temp_dir, self.config_dir, self.work_dir = apache_util.dir_setup(
+            "etc_nginx", "letsencrypt.client.plugins.nginx.tests")
 
-        self.ssl_options = setup_nginx_ssl_options(self.config_dir)
+        self.ssl_options = apache_util.setup_ssl_options(
+            self.config_dir, constants.NGINX_MOD_SSL_CONF)
 
-        self.config_path = os.path.join(
-            self.temp_dir, "testdata")
+        self.config_path = os.path.join(self.temp_dir, "etc_nginx")
 
         self.rsa256_file = pkg_resources.resource_filename(
             "letsencrypt.acme.jose", "testdata/rsa256_key.pem")
@@ -33,33 +33,8 @@ class NginxTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
 def get_data_filename(filename):
     """Gets the filename of a test data file."""
     return pkg_resources.resource_filename(
-        "letsencrypt.client.plugins.nginx.tests", "testdata/%s" % filename)
-
-
-def dir_setup(test_dir="debian_nginx/two_vhost_80"):
-    """Setup the directories necessary for the configurator."""
-    temp_dir = tempfile.mkdtemp("temp")
-    config_dir = tempfile.mkdtemp("config")
-    work_dir = tempfile.mkdtemp("work")
-
-    os.chmod(temp_dir, constants.CONFIG_DIRS_MODE)
-    os.chmod(config_dir, constants.CONFIG_DIRS_MODE)
-    os.chmod(work_dir, constants.CONFIG_DIRS_MODE)
-
-    test_configs = pkg_resources.resource_filename(
-        "letsencrypt.client.plugins.nginx.tests", test_dir)
-
-    shutil.copytree(
-        test_configs, os.path.join(temp_dir, test_dir), symlinks=True)
-
-    return temp_dir, config_dir, work_dir
-
-
-def setup_nginx_ssl_options(config_dir):
-    """Move the ssl_options into position and return the path."""
-    option_path = os.path.join(config_dir, "options-ssl.conf")
-    shutil.copyfile(constants.NGINX_MOD_SSL_CONF, option_path)
-    return option_path
+        "letsencrypt.client.plugins.nginx.tests", os.path.join(
+            "testdata", "etc_nginx", filename))
 
 
 def get_nginx_configurator(