Merge pull request #115 from manahl/xfang-httpd-drop-rhel5-support

pytest-server-fixtures: httpd: add rhel7 support

Author: javefang

CHANGES.md

@@ -4,6 +4,7 @@
 ### 1.5.0 (Unreleased)
  * pytest-server-fixtures: made postgres fixtures and its tests optional, like all other fixtures
  * pytest-server-fixtures: reverted a fix for pymongo deprecation warning, as this will break compatibility with pymongo 3.6.0
+ * pytest-server-fixtures: dropped RHEL5 support in httpd
 
 ### 1.4.1 (2019-01-18)
  * pytest-server-fixtures: server fixture binary path specified in ENV now only affect server class 'thread'

pytest-server-fixtures/pytest_server_fixtures/httpd.py

@@ -1,4 +1,6 @@
+import functools
 import os
+import platform
 import socket
 import string
 import logging
@@ -17,11 +19,15 @@
 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():
     """ Function-scoped httpd server in a local thread.
-    
+
         Methods
         -------
         get()   : Query url relative to the server root.
@@ -53,6 +59,10 @@ class HTTPDServer(HTTPTestServer):
       LoadModule authz_core_module $modules/mod_authz_core.so
     """
 
+    cfg_rhel_template = """
+      LoadModule unixd_module modules/mod_unixd.so
+    """
+
     cfg_mpm_template = """
       LoadModule mpm_prefork_module $modules/mod_mpm_prefork.so
       StartServers       1
@@ -99,10 +109,18 @@ def __init__(self, proxy_rules=None, extra_cfg='', document_root=None, log_dir=N
             Server log directory, defaults to $(workspace)/logs
         """
         self.proxy_rules = proxy_rules if proxy_rules is not None else {}
-        self.cfg_template = string.Template(self.cfg_modules_template +
-                                            self.cfg_mpm_template +
-                                            self.cfg_template +
-                                            extra_cfg)
+
+        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)
 
         # Always print debug output for this process
         os.environ['DEBUG'] = '1'
@@ -111,7 +129,7 @@ def __init__(self, proxy_rules=None, extra_cfg='', document_root=None, log_dir=N
         kwargs['hostname'] = kwargs.get('hostname', socket.gethostbyname(os.uname()[1]))
 
         super(HTTPDServer, self).__init__(**kwargs)
-        
+
         self.document_root = document_root or self.workspace
         self.document_root = Path(self.document_root)
         self.log_dir = log_dir or self.workspace / 'logs'