From 124b99342978d584ef1d6e1655271b6067ff40d6 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 17 Jul 2015 17:33:32 -0700 Subject: [PATCH] Cleanup --- tests/compatibility/configurators/apache/Dockerfile | 3 --- tests/compatibility/configurators/apache/a2enmod.sh | 4 ++-- tests/compatibility/configurators/apache/apache24.py | 4 ++-- tests/compatibility/test_driver.py | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/compatibility/configurators/apache/Dockerfile b/tests/compatibility/configurators/apache/Dockerfile index 8cde44ea6..8e7ffd0c0 100644 --- a/tests/compatibility/configurators/apache/Dockerfile +++ b/tests/compatibility/configurators/apache/Dockerfile @@ -1,6 +1,3 @@ -# https://github.com/letsencrypt/letsencrypt/pull/431#issuecomment-103659297 -# it is more likely developers will already have ubuntu:trusty rather -# than e.g. debian:jessie and image size differences are negligible FROM httpd MAINTAINER Brad Warren diff --git a/tests/compatibility/configurators/apache/a2enmod.sh b/tests/compatibility/configurators/apache/a2enmod.sh index c22adb1fb..6c33c0597 100755 --- a/tests/compatibility/configurators/apache/a2enmod.sh +++ b/tests/compatibility/configurators/apache/a2enmod.sh @@ -27,7 +27,7 @@ then enable "ssl" elif [ $2 == "rewrite" ] then - enable "rewrite"; + enable "rewrite" else - exit 1; + exit 1 fi diff --git a/tests/compatibility/configurators/apache/apache24.py b/tests/compatibility/configurators/apache/apache24.py index 48fa6714d..81e9b7b1d 100644 --- a/tests/compatibility/configurators/apache/apache24.py +++ b/tests/compatibility/configurators/apache/apache24.py @@ -10,7 +10,7 @@ from tests.compatibility.configurators.apache import common as apache_common STATIC_MODULES = {"core", "so", "http", "mpm_event", "watchdog",} -INSTALLED_MODULES = { +SHARED_MODULES = { "log_config", "logio", "version", "unixd", "access_compat", "actions", "alias", "allowmethods", "auth_basic", "auth_digest", "auth_form", "authn_anon", "authn_core", "authn_dbd", "authn_dbm", "authn_file", @@ -47,7 +47,7 @@ class Proxy(apache_common.Proxy): with open(self.test_conf, "a") as f: for module in self.modules: if module not in STATIC_MODULES: - if module in INSTALLED_MODULES: + if module in SHARED_MODULES: f.write( "LoadModule {0}_module /usr/local/apache2/modules/" "mod_{0}.so\n".format(module)) diff --git a/tests/compatibility/test_driver.py b/tests/compatibility/test_driver.py index 5e15ce155..b0fca6e4e 100644 --- a/tests/compatibility/test_driver.py +++ b/tests/compatibility/test_driver.py @@ -34,7 +34,7 @@ def get_args(): "-p", "--plugin", default="apache", help="the plugin to be tested") group.add_argument( "-v", "--verbose", dest="verbose_count", action="count", - default=0, help="You know how to use this") + default=0, help="you know how to use this") group.add_argument( "-a", "--auth", action="store_true", help="tests the challenges the plugin supports")