Skip to content

Commit 92801e8

Browse files
committed
polish
1 parent 332f2da commit 92801e8

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

Diff for: core/unittest/input/InputStaticFileUnittest.cpp

+17-15
Original file line numberDiff line numberDiff line change
@@ -537,14 +537,14 @@ void InputStaticFileUnittest::TestGetFiles() {
537537
}
538538
{
539539
// the last subdir before ** is const
540-
filesystem::create_directories("test_logs/dir1/valid_dir");
541-
filesystem::create_directories("test_logs/dir2/valid_dir");
540+
filesystem::create_directories("test_logs/dir1/dir/valid_dir");
541+
filesystem::create_directories("test_logs/dir2/dir/valid_dir");
542542
filesystem::create_directories("test_logs/unmatched_dir");
543543
{ ofstream fout("test_logs/invalid_dir"); }
544-
{ ofstream fout("test_logs/dir1/valid_dir/test1.log"); }
545-
{ ofstream fout("test_logs/dir2/valid_dir/test2.log"); }
544+
{ ofstream fout("test_logs/dir1/dir/valid_dir/test1.log"); }
545+
{ ofstream fout("test_logs/dir2/dir/valid_dir/test2.log"); }
546546

547-
filesystem::path filePath = filesystem::absolute("test_logs/dir*/valid_dir/**/*.log");
547+
filesystem::path filePath = filesystem::absolute("test_logs/dir*/dir/valid_dir/**/*.log");
548548
Json::Value configJson;
549549
configJson["FilePaths"].append(Json::Value(filePath.string()));
550550
InputStaticFile input;
@@ -557,14 +557,14 @@ void InputStaticFileUnittest::TestGetFiles() {
557557
}
558558
{
559559
// the last subdir before ** is wildcard
560-
filesystem::create_directories("test_logs/a/dir1");
561-
filesystem::create_directories("test_logs/a/dir2");
562-
filesystem::create_directories("test_logs/a/unmatched_dir");
563-
{ ofstream fout("test_logs/a/invalid_dir"); }
564-
{ ofstream fout("test_logs/a/dir1/test1.log"); }
565-
{ ofstream fout("test_logs/a/dir2/test2.log"); }
566-
567-
filesystem::path filePath = filesystem::absolute("test_logs/a/dir*/**/*.log");
560+
filesystem::create_directories("test_logs/dir1");
561+
filesystem::create_directories("test_logs/dir2");
562+
filesystem::create_directories("test_logs/unmatched_dir");
563+
{ ofstream fout("test_logs/invalid_dir"); }
564+
{ ofstream fout("test_logs/dir1/test1.log"); }
565+
{ ofstream fout("test_logs/dir2/test2.log"); }
566+
567+
filesystem::path filePath = filesystem::absolute("test_logs/dir*/**/*.log");
568568
Json::Value configJson;
569569
configJson["FilePaths"].append(Json::Value(filePath.string()));
570570
InputStaticFile input;
@@ -593,7 +593,7 @@ void InputStaticFileUnittest::TestGetFiles() {
593593
}
594594
{
595595
// invalid base path
596-
{ ofstream fout("invalid_dir"); }
596+
{ ofstream fout("test_logs"); }
597597

598598
filesystem::path filePath = filesystem::absolute("test_logs/**/*.log");
599599
Json::Value configJson;
@@ -604,7 +604,7 @@ void InputStaticFileUnittest::TestGetFiles() {
604604
APSARA_TEST_TRUE(input.Init(configJson, optionalGoPipeline));
605605
APSARA_TEST_TRUE(input.GetFiles().empty());
606606

607-
filesystem::remove("invalid_dir");
607+
filesystem::remove("test_logs");
608608
}
609609
{
610610
// normal
@@ -649,6 +649,8 @@ void InputStaticFileUnittest::TestGetFiles() {
649649
input.SetMetricsRecordRef(InputStaticFile::sName, "1");
650650
APSARA_TEST_TRUE(input.Init(configJson, optionalGoPipeline));
651651
APSARA_TEST_EQUAL(1U, input.GetFiles().size());
652+
653+
filesystem::remove_all("test_logs");
652654
}
653655
}
654656

0 commit comments

Comments
 (0)