Changeset 441a022 in nscp

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)

Files:

• CMakeLists.txt (modified) (1 diff)
• build/cmake/functions.cmake (modified) (1 diff)
• changelog (modified) (1 diff)
• helpers/installer-dlls/main_dll/main_dll.cpp (modified) (2 diffs)
• modules/PythonScript/PythonScript.cpp (modified) (5 diffs)
• modules/PythonScript/PythonScript.h (modified) (1 diff)
• scripts/CMakeLists.txt (modified) (1 diff)
• scripts/python/lib/test_helper.py (modified) (1 diff)
• scripts/python/test_all.py (modified) (1 diff)
• scripts/python/test_nrpe.py (modified) (1 diff)
• scripts/python/test_nsca.py (modified) (2 diffs)
• scripts/python/test_python.py (modified) (4 diffs)
• service/NSClient++.cpp (modified) (2 diffs)
• service/cli_parser.hpp (modified) (1 diff)
• version.hpp (modified) (1 diff)
• version.txt (modified) (1 diff)

CMakeLists.txt

@@ -476 +476 @@
   ${BUILD_TARGET_EXE_PATH}/config.py
 )
+
+ENABLE_TESTING()
+
+add_nscp_py_test(nsca test_nsca)
+add_nscp_py_test(nrpe test_nrpe)
+add_nscp_py_test(python test_python)
+IF(WIN32)
+  add_nscp_py_test(eventlog test_eventlog)
+  add_nscp_py_test(w32_system test_w32_system)
+ENDIF(WIN32)

build/cmake/functions.cmake

@@ -41 +41 @@
 ENDMACRO(copy_single_file)
 
+MACRO(add_nscp_py_test name script)
+  ADD_TEST("${name}"
+    nscp 
+      py 
+      --settings dummy 
+      --exec run 
+      --script ${script}
+      --query py_unittest
+    )
+ENDMACRO(add_nscp_py_test)
+

changelog

@@ -11 +11 @@
  * Improved the syntax and output of running unit tests
  * Refactored unit tests to be slightly nicer
+ * Fixed error state propagation
+ * Added unit tests to cmake (ie make test will now run unit tests)
   
 2012-01-16 MickeM

helpers/installer-dlls/main_dll/main_dll.cpp

@@ -228 +228 @@
     h.setPropertyAndOld(_T("CONF_NRPE"), has_key(modpath, _T("NRPEServer")));
     h.setPropertyAndOld(_T("CONF_SCHEDULER"), has_key(modpath, _T("Scheduler")));
-    h.setPropertyAndOld(_T("CONF_NSCA"), has_key(modpath, _T("NSCAAgent")));
+    h.setPropertyAndOld(_T("CONF_NSCA"), has_key(modpath, _T("NSCAClient")));
     h.setPropertyAndOld(_T("CONF_NSCLIENT"), has_key(modpath, _T("NSClientServer")));
     h.setPropertyAndOld(_T("CONF_WMI"), has_key(modpath, _T("CheckWMI")));
@@ -300 +300 @@
     write_changed_key(h, data, _T("CONF_NRPE"), modpath, _T("NRPEServer"), modval);
     write_changed_key(h, data, _T("CONF_SCHEDULER"), modpath, _T("Scheduler"), modval);
-    write_changed_key(h, data, _T("CONF_NSCA"), modpath, _T("NSCAAgent"), modval);
+    write_changed_key(h, data, _T("CONF_NSCA"), modpath, _T("NSCAClient"), modval);
     write_changed_key(h, data, _T("CONF_NSCLIENT"), modpath, _T("NSClientServer"), modval);
     write_changed_key(h, data, _T("CONF_WMI"), modpath, _T("CheckWMI"), modval);

modules/PythonScript/PythonScript.cpp

@@ -120 +120 @@
   callFunction("shutdown");
 }
-void python_script::callFunction(const std::string& functionName) {
+bool python_script::callFunction(const std::string& functionName) {
   try {
     script_wrapper::thread_locker locker;
@@ -127 +127 @@
       if( scriptFunction )
         scriptFunction();
+      return true;
     } catch( error_already_set e) {
       script_wrapper::log_exception();
+      return false;
     }
   } catch (...) {
     NSC_LOG_ERROR(_T("Unknown exception"));
-  }
-}
-void python_script::callFunction(const std::string& functionName, unsigned int i1, const std::string &s1, const std::string &s2){
+    return false;
+  }
+}
+bool python_script::callFunction(const std::string& functionName, unsigned int i1, const std::string &s1, const std::string &s2){
   try {
     script_wrapper::thread_locker locker;
@@ -141 +144 @@
       if(scriptFunction)
         scriptFunction(i1, s1, s2);
+      return true;
     } catch(error_already_set e) {
       script_wrapper::log_exception();
+      return false;
     }
   } catch (...) {
     NSC_LOG_ERROR(_T("Unknown exception"));
+    return false;
   }
 }
@@ -165 +171 @@
       path /= _T("python");
       path /= _T("lib");
+      NSC_DEBUG_MSG(_T("Lib path: ") + path.string());
       PyRun_SimpleString(("sys.path.append('" + utf8::cvt<std::string>(path.string()) + "')").c_str());
 
@@ -293 +300 @@
     script_container sc(*ofile);
     python_script script(get_id(), "", sc);
-    script.callFunction("__main__");
+    if (!script.callFunction("__main__")) {
+      message = _T("Failed to execute script: __main__");
+      return NSCAPI::returnUNKNOWN;
+    }
     message = _T("Script execute successfully...");
     return NSCAPI::returnOK;

modules/PythonScript/PythonScript.h

@@ -39 +39 @@
   python_script(unsigned int plugin_id, const std::string alias, const script_container& script);
   ~python_script();
-  void callFunction(const std::string& functionName);
-  void callFunction(const std::string& functionName, unsigned int i1, const std::string &s1, const std::string &s2);
+  bool callFunction(const std::string& functionName);
+  bool callFunction(const std::string& functionName, unsigned int i1, const std::string &s1, const std::string &s2);
   void _exec(const std::string &scriptfile);
 };

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

service/NSClient++.cpp

@@ -254 +254 @@
   }
   delete [] wargv;
+  return ret;
 }
 #endif
@@ -1257 +1258 @@
   }
   std::string response;
-  NSCAPI::nagiosReturn c = plugin->handleCommand(command.c_str(), request, response);
+  ret = plugin->handleCommand(command.c_str(), request, response);
   try {
     std::wstring msg, perf;

service/cli_parser.hpp

@@ -432 +432 @@
           mainClient.simple_exec(module, _T("help"), arguments, resp);
         } else if (mode == combined) {
-          mainClient.reload(_T("service"));
-          ret = mainClient.simple_query(module, combined_query, arguments, resp);
+          if (ret == NSCAPI::returnOK) {
+            mainClient.reload(_T("service"));
+            ret = mainClient.simple_query(module, combined_query, arguments, resp);
+          } else {
+            std::wcerr << _T("Failed to execute command, will not attempt query") << std::endl;
+          }
         }
       } else if (mode == submit) {

version.hpp

@@ -1 +1 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
-#define PRODUCTVER     0,4,0,123
-#define STRPRODUCTVER  "0,4,0,123"
-#define STRPRODUCTDATE "2012-01-16"
+#define PRODUCTVER     0,4,0,125
+#define STRPRODUCTVER  "0,4,0,125"
+#define STRPRODUCTDATE "2012-01-18"
 #endif // VERSION_HPP

version.txt

@@ -1 +1 @@
 version=0.4.0
-build=123
-date=2012-01-16
+build=125
+date=2012-01-18