Changeset 441a022 in nscp for scripts

Timestamp:

01/18/12 22:47:06 (16 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

2ec2eb6

Parents:

ffa6a59

Message:

• Fixed error state propagation
• Added unit tests to cmake (ie make test will now run unit tests)

Location:

scripts

Files:

• CMakeLists.txt (modified) (1 diff)
• python/lib/test_helper.py (modified) (1 diff)
• python/test_all.py (modified) (1 diff)
• python/test_nrpe.py (modified) (1 diff)
• python/test_nsca.py (modified) (2 diffs)
• python/test_python.py (modified) (4 diffs)

scripts/CMakeLists.txt

@@ -5 +5 @@
 FILE (GLOB scripts_PS1 "*.ps1")
 FILE (GLOB scripts_LIB "lib/*.vbs")
-IF(WIN32)
+#IF(WIN32)
 FILE (GLOB_RECURSE scripts_PYT "python/*.py")
-ELSE(WIN32)
-FILE (GLOB scripts_PYT "python/*.py" "python/lib/*.py")
-ENDIF(WIN32)
+#ELSE(WIN32)
+#FILE (GLOB scripts_PYT "python/*.py" "python/lib/*.py")
+#ENDIF(WIN32)
 FILE (GLOB scripts_LUA "lua/*.lua")
 

scripts/python/lib/test_helper.py

@@ -221 +221 @@
       return 'OK: %s'%self.title
     else:
-      (total, ok) = c.count()
+      (total, ok) = self.count()
       return 'ERROR: %s (%d/%d)'%(self.title, ok, total)
 

scripts/python/test_all.py

@@ -3 +3 @@
 
 from sys import path
-from os import getcwd
-path.append(getcwd() + '/scripts/python')
+import os
+path.append(os.getcwd() + '/scripts/python')
 
 from test_nsca import NSCAServerTest
 from test_nrpe import NRPEServerTest
 #from test_pb import NSCAServerTest
-from test_eventlog import EventLogTest
 from test_python import PythonTest
-from test_w32_system import Win32SystemTest
 
-all_tests = [NSCAServerTest, NRPEServerTest, EventLogTest, PythonTest, Win32SystemTest]
+# 
+all_tests = [NSCAServerTest, PythonTest, NRPEServerTest]
+if os.name == 'nt':
+  from test_eventlog import EventLogTest
+  from test_w32_system import Win32SystemTest
+  all_tests.extend([EventLogTest, Win32SystemTest])
 
 def __main__():

scripts/python/test_nrpe.py

@@ -1 +1 @@
 from NSCP import Settings, Registry, Core, log, status, log_error, sleep
+import sys
+log('==>%s'%sys.path)
+
 from test_helper import BasicTest, TestResult, Callable, setup_singleton, install_testcases, init_testcases, shutdown_testcases
 import plugin_pb2

scripts/python/test_nsca.py

@@ -165 +165 @@
     (result_code, err) = core.submit('nsca_test_outbox', message.SerializeToString())
 
-    result = TestResult()
+    result = TestResult('Testing payload: %s'%tag)
     result.add_message(len(err) == 0, 'Testing to send message using %s/sbp'%tag, err)
     found = self.wait_and_validate(uid, result, msg, perf, '%s/spb'%tag)
@@ -192 +192 @@
     found = self.wait_and_validate(uid, result, msg, perf, '%s/exec'%tag)
     if retry and not found:
-      return self.submit_via_exec(encryption, source, status, msg, perf, tag, False)
+      return self.submit_via_exec(encryption, source, status, msg, perf, '%s (retry)'%tag, False)
     return result
 

scripts/python/test_python.py

@@ -4 +4 @@
 from time import time
 
-install_checks = 1000
+install_checks = 100
+time_to_run = 30
+
+core = Core.get()
 
 class PythonTest(BasicTest):
@@ -36 +39 @@
     self.reg.simple_function('py_stress_noop', PythonTest.noop_handler, 'This is a simple noop command')
     self.reg.simple_subscription('py_stress_test', PythonTest.stress_handler)
+    conf = Settings.get()
+    conf.set_string('/settings/test_scheduler', 'threads', '50')
+    core.reload('test_scheduler')
+    
 
   def teardown(self):
+    conf = Settings.get()
+    conf.set_string('/settings/test_scheduler', 'threads', '0')
+    core.reload('test_scheduler')
     None
 
@@ -43 +53 @@
     result = TestResult()
     start = time()
-    while self.stress_count < install_checks*10:
-      log('Waiting for %d: %d/%d'%(install_checks*10, self.stress_count, self.noop_count))
+    total_count = install_checks*time_to_run/5
+    while self.stress_count < total_count:
+      log('Waiting for %d: %d/%d'%(total_count, self.stress_count, self.noop_count))
       old_stress_count = self.stress_count
       old_noop_count = self.noop_count
@@ -63 +74 @@
     
     base_path = '/settings/test_scheduler'
-    conf.set_string(base_path, 'threads', '50')
+    conf.set_string(base_path, 'threads', '0')
 
     default_path = '%s/default'%base_path