From 38747d9fae9994031cd00acdad520d094aab630a Mon Sep 17 00:00:00 2001 From: "yudong.cai" Date: Tue, 15 Oct 2019 16:41:08 +0800 Subject: [PATCH] MS-653 fix config unittest Former-commit-id: bd20d3caff96edc92625dbc333feaa94c5e3b841 --- core/unittest/server/test_config.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/core/unittest/server/test_config.cpp b/core/unittest/server/test_config.cpp index cee17542b5..3c5f0acffe 100644 --- a/core/unittest/server/test_config.cpp +++ b/core/unittest/server/test_config.cpp @@ -18,11 +18,13 @@ #include #include -#include "config/ConfigMgr.h" +#include "config/YamlConfigMgr.h" #include "utils/CommonUtil.h" #include "utils/ValidationUtil.h" #include "server/Config.h" +using namespace milvus; + namespace { static const char *CONFIG_FILE_PATH = "./milvus/conf/server_config.yaml"; @@ -35,16 +37,16 @@ static constexpr uint64_t GB = MB * 1024; } // namespace TEST(ConfigTest, CONFIG_TEST) { - milvus::server::ConfigMgr *config_mgr = milvus::server::ConfigMgr::GetInstance(); + server::ConfigMgr *config_mgr = server::YamlConfigMgr::GetInstance(); - milvus::ErrorCode err = config_mgr->LoadConfigFile(""); - ASSERT_EQ(err, milvus::SERVER_UNEXPECTED_ERROR); + milvus::Status s = config_mgr->LoadConfigFile(""); + ASSERT_FALSE(s.ok()); - err = config_mgr->LoadConfigFile(LOG_FILE_PATH); - ASSERT_EQ(err, milvus::SERVER_UNEXPECTED_ERROR); + s = config_mgr->LoadConfigFile(LOG_FILE_PATH); + ASSERT_FALSE(s.ok()); - err = config_mgr->LoadConfigFile(CONFIG_FILE_PATH); - ASSERT_EQ(err, milvus::SERVER_SUCCESS); + s = config_mgr->LoadConfigFile(CONFIG_FILE_PATH); + ASSERT_TRUE(s.ok()); config_mgr->Print();