fix test

alibaba · Sep 19, 2024 · 1c6d7eb · 1c6d7eb
1 parent 5f34827
commit 1c6d7eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/config/watcher/ConfigWatcher.cpp b/core/config/watcher/ConfigWatcher.cpp
@@ -80,7 +80,7 @@ PipelineConfigDiff ConfigWatcher::CheckConfigDiff() {
             filesystem::file_time_type mTime = filesystem::last_write_time(path, ec);
             if (iter == mFileInfoMap.end()) {
                 mFileInfoMap[filepath] = make_pair(size, mTime);
-                unique_ptr<Json::Value> detail = unique_ptr<Json::Value>(new Json::Value());
+                unique_ptr<Json::Value> detail = make_unique<Json::Value>(new Json::Value());
                 if (!LoadConfigDetailFromFile(path, *detail)) {
                     continue;
                 }
@@ -106,7 +106,7 @@ PipelineConfigDiff ConfigWatcher::CheckConfigDiff() {
             } else if (iter->second.first != size || iter->second.second != mTime) {
                 // for config currently running, we leave it untouched if new config is invalid
                 mFileInfoMap[filepath] = make_pair(size, mTime);
-                unique_ptr<Json::Value> detail = unique_ptr<Json::Value>(new Json::Value());
+                unique_ptr<Json::Value> detail = make_unique<Json::Value>(new Json::Value());
                 if (!LoadConfigDetailFromFile(path, *detail)) {
                     if (mPipelineManager->FindConfigByName(configName)) {
                         diff.mUnchanged.push_back(configName);

diff --git a/core/unittest/config/ConfigWatcherUnittest.cpp b/core/unittest/config/ConfigWatcherUnittest.cpp
@@ -55,7 +55,7 @@ void ConfigWatcherUnittest::InvalidConfigDirFound() const {
         { ofstream fout("config"); }
         diff = ConfigWatcher::GetInstance()->CheckConfigDiff();
         APSARA_TEST_TRUE(diff.IsEmpty());
-        filesystem::remove("config");
+        filesystem::remove_all("config");
     }
     {
         InstanceConfigDiff diff = InstanceConfigWatcher::GetInstance()->CheckConfigDiff();
@@ -64,7 +64,7 @@ void ConfigWatcherUnittest::InvalidConfigDirFound() const {
         { ofstream fout("instanceconfig"); }
         diff = InstanceConfigWatcher::GetInstance()->CheckConfigDiff();
         APSARA_TEST_TRUE(diff.IsEmpty());
-        filesystem::remove("instanceconfig");
+        filesystem::remove_all("instanceconfig");
     }
 }