X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=ossec-hids.git;a=blobdiff_plain;f=contrib%2Fossec-testing%2Fruntests.py;h=bf821cea8621e667e95986969ba4eb1e311dc2f6;hp=3508e9da3909699a464ff2df4c6d8aa5f978f515;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hpb=927951d1c1ad45ba9e7325f07d996154a91c911b

diff --git a/contrib/ossec-testing/runtests.py b/contrib/ossec-testing/runtests.py
index 3508e9d..bf821ce 100644
--- a/contrib/ossec-testing/runtests.py
+++ b/contrib/ossec-testing/runtests.py
@@ -1,55 +1,65 @@
+#!/usr/bin/env python
 import ConfigParser
-import subprocess 
-import os 
+import subprocess
+import os
 import sys
-import os.path 
+import os.path
+
 
 class OssecTester(object):
     def __init__(self):
-        self._debug = False 
-        self._quiet = False 
+        self._error = False
+        self._debug = False
+        self._quiet = False
         self._ossec_conf = "/var/ossec/etc/ossec.conf"
         self._base_dir = "/var/ossec/"
         self._ossec_path = "/var/ossec/bin/"
-        self._test_path = "./tests" 
+        self._test_path = "./tests"
 
     def buildCmd(self, rule, alert, decoder):
-        cmd = ['%s/ossec-logtest'%(self._ossec_path),] 
-        if self._ossec_conf: cmd += ["-c",self._ossec_conf]
-        if self._base_dir: cmd += ["-D", self._base_dir]
-        cmd += ['-U', "%s:%s:%s"%(rule,alert,decoder)]
+        cmd = ['%s/ossec-logtest' % (self._ossec_path), ]
+        cmd += ['-q']
+        if self._ossec_conf:
+            cmd += ["-c", self._ossec_conf]
+        if self._base_dir:
+            cmd += ["-D", self._base_dir]
+        cmd += ['-U', "%s:%s:%s" % (rule, alert, decoder)]
         return cmd
 
     def runTest(self, log, rule, alert, decoder, section, name, negate=False):
-        print self.buildCmd(rule, alert, decoder)
-        p = subprocess.Popen(self.buildCmd(rule, alert, decoder),
+        #print self.buildCmd(rule, alert, decoder)
+        p = subprocess.Popen(
+                self.buildCmd(rule, alert, decoder),
                 stdout=subprocess.PIPE,
                 stderr=subprocess.STDOUT,
                 stdin=subprocess.PIPE,
                 shell=False)
         std_out = p.communicate(log)[0]
         if (p.returncode != 0 and not negate) or (p.returncode == 0 and negate):
-            print "" 
+            self._error = True
+            print ""
             print "-" * 60
-            print "Failed: Exit code = %s"%(p.returncode) 
-            print "        Alert     = %s"%(alert) 
-            print "        Rule      = %s"%(rule)
-            print "        Decoder   = %s"%(decoder)
-            print "        Section   = %s"%(section)
-            print "        line name = %s"%(name)
-            print " " 
-            print std_out 
+            print "Failed: Exit code = %s" % (p.returncode)
+            print "        Alert     = %s" % (alert)
+            print "        Rule      = %s" % (rule)
+            print "        Decoder   = %s" % (decoder)
+            print "        Section   = %s" % (section)
+            print "        line name = %s" % (name)
+            print " "
+            print std_out
         elif self._debug:
-            print "Exit code= %s"%(p.returncode) 
+            print "Exit code= %s" % (p.returncode)
             print std_out
         else:
             sys.stdout.write(".")
 
-    def run(self):
+    def run(self, selective_test=False):
         for aFile in os.listdir(self._test_path):
             aFile = os.path.join(self._test_path, aFile)
-            print "- [ File = %s ] ---------"%(aFile)
             if aFile.endswith(".ini"):
+                if selective_test and not aFile.endswith(selective_test):
+                    continue
+                print "- [ File = %s ] ---------" % (aFile)
                 tGroup = ConfigParser.ConfigParser()
                 tGroup.read([aFile])
                 tSections = tGroup.sections()
@@ -59,23 +69,26 @@ class OssecTester(object):
                     decoder = tGroup.get(t, "decoder")
                     for (name, value) in tGroup.items(t):
                         if name.startswith("log "):
-                            if self._debug: 
-                                print "-"* 60
+                            if self._debug:
+                                print "-" * 60
                             if name.endswith("pass"):
-                                neg = False 
+                                neg = False
                             elif name.endswith("fail"):
                                 neg = True
                             else:
-                                neg = False 
-                            self.runTest(value, rule, alert, decoder, t, name, negate=neg)
+                                neg = False
+                            self.runTest(value, rule, alert, decoder,
+                                         t, name, negate=neg)
                 print ""
+        if self._error:
+            sys.exit(1)
 
 if __name__ == "__main__":
+    if len(sys.argv) == 2:
+        selective_test = sys.argv[1]
+        if not selective_test.endswith('.ini'):
+            selective_test += '.ini'
+    else:
+        selective_test = False
     OT = OssecTester()
-    OT.run() 
-
-
-
-
-
-
+    OT.run(selective_test)