tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-30 00:54:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix livestatus unit tests on OS X

Browse Source 
fixes #8806
This commit is contained in:
Gunnar Beutner 2016-08-28 08:18:40 +02:00
parent 551864b314
commit 2c8be90232
2 changed files with 30 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/CMakeLists.txt
View File

@ -120,7 +120,7 @@ if(ICINGA2_WITH_LIVESTATUS)
add_boost_test(livestatus add_boost_test(livestatus
SOURCES livestatus-test.cpp ${livestatus_test_SOURCES} SOURCES livestatus-test.cpp ${livestatus_test_SOURCES}
LIBRARIES base config icinga cli livestatus LIBRARIES base config icinga methods livestatus
DEPENDENCIES methods DEPENDENCIES methods
TESTS livestatus/hosts livestatus/services TESTS livestatus/hosts livestatus/services
) )

89
test/livestatus-test.cpp
View File

@ -20,7 +20,6 @@
#define BOOST_TEST_MAIN #define BOOST_TEST_MAIN
#define BOOST_TEST_MODULE icinga2_test #define BOOST_TEST_MODULE icinga2_test
#include "cli/daemonutility.hpp"
#include "config/configcompiler.hpp" #include "config/configcompiler.hpp"
#include "config/configitem.hpp" #include "config/configitem.hpp"
#include "base/application.hpp" #include "base/application.hpp"
@ -33,81 +32,51 @@ using namespace icinga;
struct LivestatusFixture struct LivestatusFixture
{ {
LivestatusFixture(void) LivestatusFixture(void)
: TestConfig("test-config.conf")
{ {
BOOST_TEST_MESSAGE("setup global config fixture"); BOOST_TEST_MESSAGE("setup global config fixture");
Application::InitializeBase(); Application::InitializeBase();
String cfg_file_path = TestConfig;
String cfg_file_path_tmp = TestConfig + ".tmp";
std::ofstream cfgfp;
cfgfp.open(cfg_file_path_tmp.CStr(), std::ofstream::out | std::ofstream::trunc);
cfgfp << std::fixed;
cfgfp << "object CheckCommand \"dummy\" {\n";
cfgfp << " import \"plugin-check-command\"\n";
cfgfp << " command = \"/bin/echo\"\n";
cfgfp << "}\n";
cfgfp << "object Host \"test-01\" {\n";
cfgfp << " address = \"127.0.0.1\"\n";
cfgfp << " check_command = \"dummy\"\n";
cfgfp << "}\n";
cfgfp << "object Host \"test-02\" {\n";
cfgfp << " address = \"127.0.0.2\"\n";
cfgfp << " check_command = \"dummy\"\n";
cfgfp << "}\n";
cfgfp << "apply Service \"livestatus\"{\n";
cfgfp << " check_command = \"dummy\"\n";
cfgfp << " notes = \"test livestatus\"\n";
cfgfp << " assign where match(\"test-*\", host.name)\n";
cfgfp << "}\n";
cfgfp.close();
#ifdef _WIN32
_unlink(cfg_file_path.CStr());
#endif /* _WIN32 */
if (rename(cfg_file_path_tmp.CStr(), cfg_file_path.CStr()) < 0) {
BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("rename")
<< boost::errinfo_errno(errno)
<< boost::errinfo_file_name(cfg_file_path_tmp));
}
BOOST_TEST_MESSAGE( "Preparing config objects..."); BOOST_TEST_MESSAGE( "Preparing config objects...");
/* start the Icinga application and load the configuration */ ConfigItem::RunWithActivationContext(new Function("CreateTestObjects", WrapFunction(CreateTestObjects)));
Application::DeclareSysconfDir("etc");
Application::DeclareLocalStateDir("var");
ActivationScope ascope;
Loader::LoadExtensionLibrary("icinga");
Loader::LoadExtensionLibrary("methods"); //loaded by ITL
std::vector<std::string> configs;
configs.push_back(TestConfig);
std::vector<ConfigItem::Ptr> newItems;
DaemonUtility::LoadConfigFiles(configs, newItems, "icinga2.debug", "icinga2.vars");
/* ignore config errors */
WorkQueue upq;
ConfigItem::ActivateItems(upq, newItems);
} }
~LivestatusFixture(void) ~LivestatusFixture(void)
{ {
BOOST_TEST_MESSAGE("cleanup global config fixture"); BOOST_TEST_MESSAGE("cleanup global config fixture");
unlink(TestConfig.CStr());
Application::UninitializeBase(); Application::UninitializeBase();
} }
String TestConfig; static void CreateTestObjects(void)
{
String config = R"CONFIG(
object CheckCommand "dummy" {
import "plugin-check-command"
command = "/bin/echo"
}
object Host "test-01" {
address = "127.0.0.1"
check_command = "dummy"
}
object Host "test-02" {
address = "127.0.0.2"
check_command = "dummy"
}
apply Service "livestatus"{
check_command = "dummy"
notes = "test livestatus"
assign where match("test-*", host.name)
}
)CONFIG";
Expression *expr = ConfigCompiler::CompileText("<livestatus>", config);
expr->Evaluate(*ScriptFrame::GetCurrentFrame());
}
}; };
BOOST_GLOBAL_FIXTURE(LivestatusFixture); BOOST_GLOBAL_FIXTURE(LivestatusFixture);