Fixed python tests

Author: mickem

scripts/python/lib/test_helper.py

@@ -21,7 +21,7 @@ def setup(self, plugin_id, prefix):
     def teardown(self):
         pass
 
-    def run_test(self):
+    def run_test(self, cases = None):
         result = TestResult('run_test')
         result.add_message(False, 'TODO add implementation')
         return result
@@ -68,7 +68,7 @@ def __init__(self, plugin_id = 0, plugin_alias = '', script_alias = ''):
     def set_show_ok(self):
         self.show_all = True
 
-    def add_case(self, cases):
+    def add_case(self, cases : List[str]):
         self.cases.extend(cases)
 
     def add(self, suites : List[BasicTest]):
@@ -80,7 +80,8 @@ def run(self):
         for suite in self.suites:
             suite.setup(self.plugin_id, self.prefix)
             suite_result = TestResult('Running suite: %s'%suite.title())
-            suite_result.append(suite.run_test())
+            cases = self.cases if self.cases else None
+            suite_result.append(suite.run_test(cases))
             result.append(suite_result)
             result.add_message(suite_result.is_ok(), 'Result from suite: %s'%suite.title())
             suite.teardown()

scripts/python/test_eventlog.py

@@ -132,7 +132,7 @@ def test_syntax(self, filter, syntax, expected):
         result.assert_equals(msg, expected, "Validate message rendering syntax: %s"%msg)
         return result
 
-    def run_test(self):
+    def run_test(self, cases = None):
         result = TestResult('Checking CheckEventLog')
         cache = TestResult('Checking CheckEventLog CACHE')
 

scripts/python/test_external_script.py

@@ -61,7 +61,7 @@ def do_one_test(self, script, expected = status.OK, message = "Foo Bar", args=[]
 				log_error(l)
 		return result
 
-	def run_test(self):
+	def run_test(self, cases = None):
 		ret = TestResult('External scripts test suite')
 		result = TestResult('Arguments NOT allowed')
 		result.add(self.do_one_test('tes_script_ok', message='OK: Everything is going to be fine'))

scripts/python/test_log_file.py

@@ -120,7 +120,7 @@ def run_boundry_test(self):
 
 		return result
 
-	def run_test(self):
+	def run_test(self, cases = None):
 		result = TestResult('Test')
 		result.append(self.run_filter_operator_test())
 		result.append(self.run_boundry_test())

scripts/python/test_nrpe.py

@@ -228,7 +228,7 @@ def do_one_test(self, ssl=True, length=1024):
 		result.add(self.test_one(ssl, length, state = status.CRITICAL, tag = 'crit'))
 		return result
 
-	def run_test(self, cases=None):
+	def run_test(self, cases = None):
 		result = TestResult()
 		result.add(self.do_one_test(ssl=True))
 		result.add(self.do_one_test(ssl=False))

scripts/python/test_nsca.py

@@ -292,7 +292,7 @@ def test_one_crypto(self, crypto, length=512):
 			result.add(self.test_one_crypto_full(crypto, status.CRITICAL, 'crit', target, length))
 		return result
 
-	def run_test(self, cases=None):
+	def run_test(self, cases = None):
 		result = TestResult()
 		cryptos = ["none", "xor", "des", "3des", "cast128", "xtea", "blowfish", "twofish", "rc2", "aes", "aes256", "aes192", "aes128", "serpent", "gost", "3way"]
 		for c in cryptos:

scripts/python/test_nscp.py

@@ -219,7 +219,7 @@ def do_one_test(self, ssl=True):
 		#result.add(self.test_one(ssl, length, state = status.CRITICAL, tag = 'crit'))
 		return result
 
-	def run_test(self):
+	def run_test(self, cases = None):
 		result = TestResult()
 		result.add(self.do_one_test(ssl=False))
 		#result.add(self.do_one_test(ssl=True))

scripts/python/test_pb.py

@@ -88,7 +88,7 @@ def test_simple(self, command, code, message, perf, tag):
 		return result
 
 
-	def run_test(self):
+	def run_test(self, cases = None):
 		result = TestResult()
 		result.add(self.test_simple('foobar', status.OK, 'qwerty', '', 'simple ok'))
 		result.add(self.test_simple('foobar', status.WARNING, 'foobar', '', 'simple warning'))

scripts/python/test_python.py

@@ -48,7 +48,7 @@ def teardown(self):
 		self.core.reload('test_scheduler')
 		None
 
-	def run_test(self):
+	def run_test(self, cases = None):
 		result = TestResult()
 		start = time()
 		total_count = install_checks*time_to_run/5

scripts/python/test_scheduler.py

@@ -60,7 +60,7 @@ def check_one(self, result, key, min, max):
         result.assert_gt(self.command_count[key], min, 'check %s (%d) fired more then %d'%(key, self.command_count[key], min))
         result.assert_lt(self.command_count[key], max, 'check %s (%d) fired less then %d'%(key, self.command_count[key], max))
 
-    def run_test(self):
+    def run_test(self, cases = None):
         self.core.load_module('Scheduler', self.sched_alias)
         result = TestResult()
         start = time()