Merge branch 'main' into zs/put-overwrite-policy

1 files changed, 12 insertions, 11 deletions

diff --git a/src/zenserver-test/zenserver-test.cpp b/src/zenserver-test/zenserver-test.cpp
index 01c3144ad..301f93a55 100644
--- a/src/zenserver-test/zenserver-test.cpp
+++ b/src/zenserver-test/zenserver-test.cpp
@@ -100,6 +100,7 @@ main(int argc, char** argv)
 	using namespace std::literals;
 	using namespace zen;
 
+	zen::TraceInit("zenserver-test");
 	zen::logging::InitializeLogging();
 
 	zen::logging::SetLogLevel(zen::logging::level::Debug);
@@ -3361,9 +3362,9 @@ TEST_CASE("project.remote")
 		{
 			cpr::Response StatusResponse = Session.Get();
 			CHECK(IsHttpSuccessCode(StatusResponse.status_code));
-			CbObject ReponseObject =
+			CbObject ResponseObject =
 				LoadCompactBinaryObject(IoBuffer(IoBuffer::Wrap, StatusResponse.text.data(), StatusResponse.text.size()));
-			std::string_view Status = ReponseObject["Status"sv].AsString();
+			std::string_view Status = ResponseObject["Status"sv].AsString();
 			CHECK(Status != "Aborted"sv);
 			if (Status == "Complete"sv)
 			{
@@ -3650,18 +3651,18 @@ GenerateFolderContent(const std::filesystem::path& RootPath)
 	std::filesystem::path EmptyFolder(RootPath / "empty_folder");
 
 	std::filesystem::path FirstFolder(RootPath / "first_folder");
-	std::filesystem::create_directory(FirstFolder);
+	CreateDirectories(FirstFolder);
 	Result.push_back(std::make_pair(FirstFolder / "first_folder_blob1.bin", CreateRandomBlob(22)));
 	Result.push_back(std::make_pair(FirstFolder / "first_folder_blob2.bin", CreateRandomBlob(122)));
 
 	std::filesystem::path SecondFolder(RootPath / "second_folder");
-	std::filesystem::create_directory(SecondFolder);
+	CreateDirectories(SecondFolder);
 	Result.push_back(std::make_pair(SecondFolder / "second_folder_blob1.bin", CreateRandomBlob(522)));
 	Result.push_back(std::make_pair(SecondFolder / "second_folder_blob2.bin", CreateRandomBlob(122)));
 	Result.push_back(std::make_pair(SecondFolder / "second_folder_blob3.bin", CreateRandomBlob(225)));
 
 	std::filesystem::path SecondFolderChild(SecondFolder / "child_in_second");
-	std::filesystem::create_directory(SecondFolderChild);
+	CreateDirectories(SecondFolderChild);
 	Result.push_back(std::make_pair(SecondFolderChild / "second_child_folder_blob1.bin", CreateRandomBlob(622)));
 
 	for (const auto& It : Result)
@@ -3817,7 +3818,7 @@ TEST_CASE("workspaces.create")
 	while (true)
 	{
 		std::error_code Ec;
-		std::filesystem::remove_all(Root2Path / Share2Path, Ec);
+		DeleteDirectories(Root2Path / Share2Path, Ec);
 		if (!Ec)
 			break;
 	}
@@ -3974,7 +3975,7 @@ TEST_CASE("workspaces.lifetimes")
 	}
 
 	// Wipe system config
-	std::filesystem::remove_all(SystemRootPath);
+	DeleteDirectories(SystemRootPath);
 
 	// Restart
 
@@ -4040,8 +4041,8 @@ TEST_CASE("workspaces.share")
 			uint64_t			  Size		  = FileObject["size"sv].AsUInt64();
 			std::u8string_view	  Path		  = FileObject["clientpath"sv].AsU8String();
 			std::filesystem::path AbsFilePath = SharePath / Path;
-			CHECK(std::filesystem::is_regular_file(AbsFilePath));
-			CHECK(std::filesystem::file_size(AbsFilePath) == Size);
+			CHECK(IsFile(AbsFilePath));
+			CHECK(FileSizeFromPath(AbsFilePath) == Size);
 			Files.insert_or_assign(ChunkId, std::make_pair(AbsFilePath, Size));
 		}
 	}
@@ -4064,7 +4065,7 @@ TEST_CASE("workspaces.share")
 				CHECK(ChunkId != Oid::Zero);
 				std::u8string_view	  Path		  = FileObject["clientpath"sv].AsU8String();
 				std::filesystem::path AbsFilePath = SharePath / Path;
-				CHECK(std::filesystem::is_regular_file(AbsFilePath));
+				CHECK(IsFile(AbsFilePath));
 			}
 		}
 	}
@@ -4084,7 +4085,7 @@ TEST_CASE("workspaces.share")
 			CHECK(ChunkId != Oid::Zero);
 			std::u8string_view	  Path		  = FileObject["clientpath"sv].AsU8String();
 			std::filesystem::path AbsFilePath = SharePath / Path;
-			CHECK(std::filesystem::is_regular_file(AbsFilePath));
+			CHECK(IsFile(AbsFilePath));
 		}
 	}