diff --git a/pytest-server-fixtures/pytest_server_fixtures/httpd.py b/pytest-server-fixtures/pytest_server_fixtures/httpd.py index 5a80395..5deb3ba 100644 --- a/pytest-server-fixtures/pytest_server_fixtures/httpd.py +++ b/pytest-server-fixtures/pytest_server_fixtures/httpd.py @@ -14,10 +14,6 @@ log = logging.getLogger(__name__) -def is_rhel(): - """"Check if OS is RHEL/Centos""" - return 'el' in platform.uname()[2] - @pytest.yield_fixture(scope='function') @yield_requires_config(CONFIG, ['httpd_executable', 'httpd_modules']) def httpd_server(): @@ -52,9 +48,6 @@ class HTTPDServer(HTTPTestServer): LoadModule mime_module $modules/mod_mime.so LoadModule authz_core_module $modules/mod_authz_core.so - """ - - cfg_rhel_template = """ LoadModule unixd_module modules/mod_unixd.so """ @@ -105,17 +98,10 @@ def __init__(self, proxy_rules=None, extra_cfg='', document_root=None, log_dir=N """ self.proxy_rules = proxy_rules if proxy_rules is not None else {} - if not is_rhel(): - self.cfg_template = string.Template(self.cfg_modules_template + - self.cfg_mpm_template + - self.cfg_template + - extra_cfg) - else: - self.cfg_template = string.Template(self.cfg_modules_template + - self.cfg_rhel_template + - self.cfg_mpm_template + - self.cfg_template + - extra_cfg) + self.cfg_template = string.Template(self.cfg_modules_template + + self.cfg_mpm_template + + self.cfg_template + + extra_cfg) # Always print debug output for this process os.environ['DEBUG'] = '1'