Module: check_mk
Branch: master
Commit: c9aade3dbe305f9d53bdc37dd719bd93e58eeb0b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9aade3dbe305f…
Author: Sergey Kipnis <sk(a)mathias-kettner.de>
Date: Fri May 3 17:54:14 2019 +0200
[CMK-2048] - lesser fixes
- marked test message with <GTEST>
- recovered unit tests(winperf section counting)
- minor: cleaned log output from ec.message
Change-Id: Ieebd7f63c81bc43c8c709961444edbd7e70b1f92
---
agents/wnx/src/engine/cfg.cpp | 4 ++--
agents/wnx/watest/test-spool.cpp | 11 +++--------
agents/wnx/watest/test-yaml.cpp | 23 ++++++++++-------------
3 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/agents/wnx/src/engine/cfg.cpp b/agents/wnx/src/engine/cfg.cpp
index deb89b3..d4d1170 100644
--- a/agents/wnx/src/engine/cfg.cpp
+++ b/agents/wnx/src/engine/cfg.cpp
@@ -569,8 +569,8 @@ const std::wstring FindConfigFile(std::filesystem::path Dir,
if (fs::exists(file_path, ec)) {
return file_path.lexically_normal().wstring();
}
- XLOG::l("Config file '{}' not found, status [{}] '{}'",
- file_path.u8string(), ec.value(), ec.message());
+ XLOG::l("Config file '{}' not found, status [{}]: {}",
file_path.u8string(),
+ ec.value(), ec.message());
return {};
}
}; // namespace cma::cfg
diff --git a/agents/wnx/watest/test-spool.cpp b/agents/wnx/watest/test-spool.cpp
index 8784232..513498a 100644
--- a/agents/wnx/watest/test-spool.cpp
+++ b/agents/wnx/watest/test-spool.cpp
@@ -10,17 +10,12 @@
#include <future>
#include <string_view>
-#include "common/cfg_info.h"
-
-#include "read_file.h"
-
#include "cfg.h"
#include "cfg_details.h"
-
#include "cma_core.h"
-
+#include "common/cfg_info.h"
#include "providers/spool.h"
-
+#include "read_file.h"
#include "test_tools.h"
static void CleanFolder(std::filesystem::path Dir) {
@@ -68,7 +63,7 @@ TEST(SectionProviderSpool, BaseApi) {
namespace fs = std::filesystem;
fs::path dir = cma::cfg::GetSpoolDir();
EXPECT_TRUE(cma::provider::IsDirectoryValid(dir));
- EXPECT_FALSE(cma::provider::IsDirectoryValid(dir / "a"));
+ EXPECT_FALSE(cma::provider::IsDirectoryValid(dir / "<GTEST>"));
ASSERT_TRUE(!dir.empty() &&
dir.u8string().find("\\spool") != std::string::npos);
diff --git a/agents/wnx/watest/test-yaml.cpp b/agents/wnx/watest/test-yaml.cpp
index f90c251..8c95876 100644
--- a/agents/wnx/watest/test-yaml.cpp
+++ b/agents/wnx/watest/test-yaml.cpp
@@ -5,22 +5,18 @@
#include <filesystem>
+#include "cfg.h"
+#include "cfg_details.h"
#include "common/cfg_info.h"
#include "common/mailslot_transport.h"
#include "common/wtools.h"
+#include "providers/mrpe.h"
+#include "read_file.h"
#include "tools/_misc.h"
#include "tools/_process.h"
#include "tools/_tgt.h"
-
-#include "read_file.h"
#include "yaml-cpp/yaml.h"
-#include "cfg_details.h"
-
-#include "cfg.h"
-
-#include "providers/mrpe.h"
-
namespace cma::cfg::details { // to become friendly for cma::cfg classes
static std::filesystem::path CreateYamlnInTemp(const std::string& Name,
@@ -111,11 +107,12 @@ TEST(AgentConfig, Aggregate) {
" - 9999 : the_the\n"
" - Terminal Services: ts_sessions\n");
auto r = YAML::LoadFile(cfgs[0].u8string());
- ASSERT_EQ(r[groups::kWinPerf][vars::kWinPerfCounters].size(), 4);
+ ASSERT_EQ(r[groups::kWinPerf][vars::kWinPerfCounters].size(), 3);
auto b = YAML::LoadFile(cfgs[1].u8string());
ASSERT_EQ(b[groups::kWinPerf][vars::kWinPerfCounters].size(), 4);
ConfigInfo::smartMerge(r, b);
- ASSERT_EQ(r[groups::kWinPerf][vars::kWinPerfCounters].size(), 5);
+ ASSERT_EQ(r[groups::kWinPerf][vars::kWinPerfCounters].size(),
+ 6); // three new, 638, 9999 and ts
ASSERT_EQ(r["bakery"]["status"].as<std::string>(),
"loaded");
}
@@ -129,7 +126,7 @@ TEST(AgentConfig, Aggregate) {
auto x = yaml["global"]["enabled"].as<bool>();
ASSERT_EQ(yaml["global"]["enabled"].as<bool>(), false);
ASSERT_EQ(yaml["global"]["async"].as<bool>(), true);
- ASSERT_EQ(yaml[groups::kWinPerf][vars::kWinPerfCounters].size(), 5);
+ ASSERT_EQ(yaml[groups::kWinPerf][vars::kWinPerfCounters].size(), 6);
CreateTestFile(cfgs[2], "user:\n status: 'loaded'\nglobal:\n port:
111");
@@ -141,7 +138,7 @@ TEST(AgentConfig, Aggregate) {
ASSERT_EQ(yaml["global"]["enabled"].as<bool>(), false);
ASSERT_EQ(yaml["global"]["port"].as<int>(), 111);
ASSERT_EQ(yaml["global"]["async"].as<bool>(), true);
- ASSERT_EQ(yaml[groups::kWinPerf][vars::kWinPerfCounters].size(), 5);
+ ASSERT_EQ(yaml[groups::kWinPerf][vars::kWinPerfCounters].size(), 6);
EXPECT_TRUE(G_ConfigInfo.isBakeryLoaded());
EXPECT_TRUE(G_ConfigInfo.isUserLoaded());
}
@@ -383,7 +380,7 @@ TEST(AgentConfig, WorkScenario) {
auto winperf_counters =
GetPairArray(groups::kWinPerf, vars::kWinPerfCounters);
- EXPECT_EQ(winperf_counters.size(), 4);
+ EXPECT_EQ(winperf_counters.size(), 3);
for (const auto& counter : winperf_counters) {
auto id = counter.first;
EXPECT_TRUE(id != "");