Changeset 1507

Timestamp:

06/06/08 10:56:59 (7 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/qa/061-PAM.py (modified) (1 diff)
• cherokee/trunk/qa/167-RuleGeoIP.py (modified) (1 diff)
• cherokee/trunk/qa/base.py (modified) (1 diff)
• cherokee/trunk/qa/util.py (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-06-06  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * qa/base.py (TestBase.has_module),
+        qa/util.py (cherokee_has_plugin): The base.has_module() is
+        replaced with cherokee_has_plugin() helper function. It is now
+        able to detect both dynamic and built-in plug-ins.
-
-        * cherokee/main.c: Added a new -i, --print-server-info parameter.

cherokee/trunk/qa/061-PAM.py

@@ -42 +42 @@
-
-        # Check that pam module was compiled
-self.has_module
+cherokee_has_plugin
-            return False
-

cherokee/trunk/qa/167-RuleGeoIP.py

@@ -39 +39 @@
-        return True
-        # Check that pam module was compiled
-self.has_module
+cherokee_has_plugin
-            return False
-        return True

cherokee/trunk/qa/base.py

@@ -341 +341 @@
-            return final
-
-    def has_module (self, module):
-        try:
-            pams = filter(lambda x: module in x, os.listdir(CHEROKEE_MODS))
-            if len(pams) < 1:
-                return False
-        except:
-            return False
-        return True
-
-
-class TestCollection:

cherokee/trunk/qa/util.py

@@ -145 +145 @@
-    __free_port += 1
-    return __free_port
+
+
+_built_in_list      = []
+_built_in_list_done = False
+
+def cherokee_has_plugin (module):
+    # Check for the dynamic plug-in
+    try:
+        mods = filter(lambda x: module in x, os.listdir(CHEROKEE_MODS))
+        if len(mods) >= 1:
+            return True
+    except:
+        pass
+
+    # Let's see whether it's built-in
+    global _built_in_list
+    global _built_in_list_done
+
+    if not _built_in_list_done:
+        _built_in_list_done = True
+
+        f = os.popen ("%s -i" % (CHEROKEE_PATH))
+        cont = f.read()
+        f.close()
+        
+        try:
+            line = filter(lambda x: x.startswith (" Built-in: "), cont.split("\n"))[0]
+            line = line.replace(" Built-in: ", "")
+            _built_in_list = line.split(" ")
+        except:
+            pass
+
+    return module in _built_in_list
+