Merge branch 'main' into lm/oidctoken-exe-path

6 files changed, 287 insertions, 28 deletions

diff --git a/src/zenserver-test/cache-tests.cpp b/src/zenserver-test/cache-tests.cpp
index 854590987..0272d3797 100644
--- a/src/zenserver-test/cache-tests.cpp
+++ b/src/zenserver-test/cache-tests.cpp
@@ -35,7 +35,7 @@ TEST_CASE("zcache.basic")
 
 	{
 		ZenServerInstance Instance1(TestEnv);
-		Instance1.SetTestDir(TestDir);
+		Instance1.SetDataDir(TestDir);
 
 		const uint16_t	  PortNumber = Instance1.SpawnServerAndWaitUntilReady();
 		const std::string BaseUri	 = fmt::format("http://localhost:{}/z$", PortNumber);
@@ -91,7 +91,7 @@ TEST_CASE("zcache.basic")
 
 	{
 		ZenServerInstance Instance1(TestEnv);
-		Instance1.SetTestDir(TestDir);
+		Instance1.SetDataDir(TestDir);
 		const uint16_t PortNumber = Instance1.SpawnServerAndWaitUntilReady();
 
 		const std::string BaseUri = fmt::format("http://localhost:{}/z$", PortNumber);
@@ -167,7 +167,7 @@ TEST_CASE("zcache.cbpackage")
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 
 		ZenServerInstance Instance1(TestEnv);
-		Instance1.SetTestDir(TestDir);
+		Instance1.SetDataDir(TestDir);
 		const uint16_t	  PortNumber = Instance1.SpawnServerAndWaitUntilReady();
 		const std::string BaseUri	 = fmt::format("http://localhost:{}/z$", PortNumber);
 
@@ -203,11 +203,11 @@ TEST_CASE("zcache.cbpackage")
 		std::filesystem::path RemoteDataDir = TestEnv.CreateNewTestDir();
 
 		ZenServerInstance RemoteInstance(TestEnv);
-		RemoteInstance.SetTestDir(RemoteDataDir);
+		RemoteInstance.SetDataDir(RemoteDataDir);
 		const uint16_t RemotePortNumber = RemoteInstance.SpawnServerAndWaitUntilReady();
 
 		ZenServerInstance LocalInstance(TestEnv);
-		LocalInstance.SetTestDir(LocalDataDir);
+		LocalInstance.SetDataDir(LocalDataDir);
 		LocalInstance.SpawnServer(TestEnv.GetNewPortNumber(),
 								  fmt::format("--upstream-thread-count=0 --upstream-zen-url=http://localhost:{}", RemotePortNumber));
 		const uint16_t LocalPortNumber = LocalInstance.WaitUntilReady();
@@ -261,11 +261,11 @@ TEST_CASE("zcache.cbpackage")
 		std::filesystem::path RemoteDataDir = TestEnv.CreateNewTestDir();
 
 		ZenServerInstance RemoteInstance(TestEnv);
-		RemoteInstance.SetTestDir(RemoteDataDir);
+		RemoteInstance.SetDataDir(RemoteDataDir);
 		const uint16_t RemotePortNumber = RemoteInstance.SpawnServerAndWaitUntilReady();
 
 		ZenServerInstance LocalInstance(TestEnv);
-		LocalInstance.SetTestDir(LocalDataDir);
+		LocalInstance.SetDataDir(LocalDataDir);
 		LocalInstance.SpawnServer(TestEnv.GetNewPortNumber(),
 								  fmt::format("--upstream-thread-count=0 --upstream-zen-url=http://localhost:{}", RemotePortNumber));
 		const uint16_t LocalPortNumber = LocalInstance.WaitUntilReady();
@@ -756,7 +756,7 @@ TEST_CASE("zcache.rpc")
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 
 		ZenServerInstance Inst(TestEnv);
-		Inst.SetTestDir(TestDir);
+		Inst.SetDataDir(TestDir);
 
 		const uint16_t	  BasePort = Inst.SpawnServerAndWaitUntilReady();
 		const std::string BaseUri  = fmt::format("http://localhost:{}/z$", BasePort);
@@ -786,7 +786,7 @@ TEST_CASE("zcache.rpc")
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 
 		ZenServerInstance Inst(TestEnv);
-		Inst.SetTestDir(TestDir);
+		Inst.SetDataDir(TestDir);
 		const uint16_t	  BasePort = Inst.SpawnServerAndWaitUntilReady();
 		const std::string BaseUri  = fmt::format("http://localhost:{}/z$", BasePort);
 
@@ -1239,7 +1239,7 @@ TEST_CASE("zcache.rpc")
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 
 		ZenServerInstance Inst(TestEnv);
-		Inst.SetTestDir(TestDir);
+		Inst.SetDataDir(TestDir);
 
 		const uint16_t	  BasePort = Inst.SpawnServerAndWaitUntilReady();
 		const std::string BaseUri  = fmt::format("http://localhost:{}/z$", BasePort);
diff --git a/src/zenserver-test/hub-tests.cpp b/src/zenserver-test/hub-tests.cpp
new file mode 100644
index 000000000..42a5dcae4
--- /dev/null
+++ b/src/zenserver-test/hub-tests.cpp
@@ -0,0 +1,252 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#if ZEN_WITH_TESTS
+#	include "zenserver-test.h"
+#	include <zencore/testing.h>
+#	include <zencore/testutils.h>
+#	include <zencore/workthreadpool.h>
+#	include <zencore/compactbinarybuilder.h>
+#	include <zencore/compactbinarypackage.h>
+#	include <zencore/compress.h>
+#	include <zencore/filesystem.h>
+#	include <zencore/stream.h>
+#	include <zencore/string.h>
+#	include <zencore/fmtutils.h>
+#	include <zencore/scopeguard.h>
+#	include <zenhttp/packageformat.h>
+#	include <zenremotestore/builds/buildstoragecache.h>
+#	include <zenutil/workerpools.h>
+#	include <zenutil/zenserverprocess.h>
+#	include <zenhttp/httpclient.h>
+#	include <zenutil/consul.h>
+
+namespace zen::tests::hub {
+
+using namespace std::literals;
+
+TEST_SUITE_BEGIN("hub.lifecycle");
+
+TEST_CASE("hub.lifecycle.basic")
+{
+	{
+		ZenServerInstance Instance(TestEnv, ZenServerInstance::ServerMode::kHubServer);
+
+		const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady();
+		CHECK(PortNumber != 0);
+
+		HttpClient Client(Instance.GetBaseUri() + "/hub/");
+
+		HttpClient::Response Result = Client.Get("status");
+		CHECK(Result);
+	}
+}
+
+TEST_CASE("hub.lifecycle.children")
+{
+	ZenServerInstance Instance(TestEnv, ZenServerInstance::ServerMode::kHubServer);
+
+	const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady();
+	REQUIRE(PortNumber != 0);
+
+	SUBCASE("spawn")
+	{
+		HttpClient Client(Instance.GetBaseUri() + "/hub/");
+
+		HttpClient::Response Result = Client.Get("status");
+		REQUIRE(Result);
+
+		{
+			Result = Client.Post("modules/abc/provision");
+			REQUIRE(Result);
+
+			CbObject AbcResult = Result.AsObject();
+			CHECK(AbcResult["moduleId"].AsString() == "abc"sv);
+			const uint16_t AbcPort = AbcResult["port"].AsUInt16(0);
+			CHECK_NE(AbcPort, 0);
+
+			// This should be a fresh instance with no contents
+
+			HttpClient AbcClient(fmt::format("http://localhost:{}", AbcPort));
+
+			Result = AbcClient.Get("/z$/ns1/b/0123456789abcdef0123456789abcdef01234567");
+			CHECK_EQ(Result.StatusCode, HttpResponseCode::NotFound);
+
+			Result = AbcClient.Put("/z$/ns1/b/0123456789abcdef0123456789abcdef01234567",
+								   IoBufferBuilder::MakeFromMemory(MakeMemoryView("abcdef"sv)));
+			CHECK_EQ(Result.StatusCode, HttpResponseCode::Created);
+		}
+
+		{
+			Result = Client.Post("modules/def/provision");
+			REQUIRE(Result);
+
+			CbObject DefResult = Result.AsObject();
+			CHECK(DefResult["moduleId"].AsString() == "def"sv);
+			const uint16_t DefPort = DefResult["port"].AsUInt16(0);
+			REQUIRE_NE(DefPort, 0);
+
+			// This should be a fresh instance with no contents
+
+			HttpClient DefClient(fmt::format("http://localhost:{}", DefPort));
+
+			Result = DefClient.Get("/z$/ns1/b/0123456789abcdef0123456789abcdef01234567");
+			CHECK_EQ(Result.StatusCode, HttpResponseCode::NotFound);
+
+			Result = DefClient.Put("/z$/ns1/b/0123456789abcdef0123456789abcdef01234567",
+								   IoBufferBuilder::MakeFromMemory(MakeMemoryView("AbcDef"sv)));
+			CHECK_EQ(Result.StatusCode, HttpResponseCode::Created);
+		}
+
+		// this should be rejected because of the invalid module id
+		Result = Client.Post("modules/!!!!!/provision");
+		CHECK(!Result);
+
+		Result = Client.Post("modules/ghi/provision");
+		REQUIRE(Result);
+
+		// Tear down instances
+
+		Result = Client.Post("modules/abc/deprovision");
+		REQUIRE(Result);
+
+		Result = Client.Post("modules/def/deprovision");
+		REQUIRE(Result);
+
+		Result = Client.Post("modules/ghi/deprovision");
+		REQUIRE(Result);
+
+		// re-provision to verify that (de)hydration preserved state
+		{
+			Result = Client.Post("modules/abc/provision");
+			REQUIRE(Result);
+
+			CbObject AbcResult = Result.AsObject();
+			CHECK(AbcResult["moduleId"].AsString() == "abc"sv);
+			const uint16_t AbcPort = AbcResult["port"].AsUInt16(0);
+			REQUIRE_NE(AbcPort, 0);
+
+			// This should contain the content from the previous run
+
+			HttpClient AbcClient(fmt::format("http://localhost:{}", AbcPort));
+
+			Result = AbcClient.Get("/z$/ns1/b/0123456789abcdef0123456789abcdef01234567");
+			CHECK_EQ(Result.StatusCode, HttpResponseCode::OK);
+
+			CHECK_EQ(Result.AsText(), "abcdef"sv);
+
+			Result = AbcClient.Put("/z$/ns1/b/1123456789abcdef0123456789abcdef01234567",
+								   IoBufferBuilder::MakeFromMemory(MakeMemoryView("ghijklmnop"sv)));
+			CHECK_EQ(Result.StatusCode, HttpResponseCode::Created);
+		}
+
+		{
+			Result = Client.Post("modules/def/provision");
+			REQUIRE(Result);
+
+			CbObject DefResult = Result.AsObject();
+			CHECK(DefResult["moduleId"].AsString() == "def"sv);
+			const uint16_t DefPort = DefResult["port"].AsUInt16(0);
+			REQUIRE_NE(DefPort, 0);
+
+			// This should contain the content from the previous run
+
+			HttpClient DefClient(fmt::format("http://localhost:{}", DefPort));
+
+			Result = DefClient.Get("/z$/ns1/b/0123456789abcdef0123456789abcdef01234567");
+			CHECK_EQ(Result.StatusCode, HttpResponseCode::OK);
+
+			CHECK_EQ(Result.AsText(), "AbcDef"sv);
+
+			Result = DefClient.Put("/z$/ns1/b/1123456789abcdef0123456789abcdef01234567",
+								   IoBufferBuilder::MakeFromMemory(MakeMemoryView("GhijklmNop"sv)));
+			CHECK_EQ(Result.StatusCode, HttpResponseCode::Created);
+		}
+
+		Result = Client.Post("modules/abc/deprovision");
+		REQUIRE(Result);
+
+		Result = Client.Post("modules/def/deprovision");
+		REQUIRE(Result);
+
+		// re-provision to verify that (de)hydration preserved state, including
+		// state which was generated after the very first dehydration
+		{
+			Result = Client.Post("modules/abc/provision");
+			REQUIRE(Result);
+
+			CbObject AbcResult = Result.AsObject();
+			CHECK(AbcResult["moduleId"].AsString() == "abc"sv);
+			const uint16_t AbcPort = AbcResult["port"].AsUInt16(0);
+			REQUIRE_NE(AbcPort, 0);
+
+			// This should contain the content from the previous two runs
+
+			HttpClient AbcClient(fmt::format("http://localhost:{}", AbcPort));
+
+			Result = AbcClient.Get("/z$/ns1/b/0123456789abcdef0123456789abcdef01234567");
+			CHECK_EQ(Result.StatusCode, HttpResponseCode::OK);
+
+			CHECK_EQ(Result.AsText(), "abcdef"sv);
+
+			Result = AbcClient.Get("/z$/ns1/b/1123456789abcdef0123456789abcdef01234567");
+			CHECK_EQ(Result.StatusCode, HttpResponseCode::OK);
+
+			CHECK_EQ(Result.AsText(), "ghijklmnop"sv);
+		}
+
+		{
+			Result = Client.Post("modules/def/provision");
+			REQUIRE(Result);
+
+			CbObject DefResult = Result.AsObject();
+			REQUIRE(DefResult["moduleId"].AsString() == "def"sv);
+			const uint16_t DefPort = DefResult["port"].AsUInt16(0);
+			REQUIRE_NE(DefPort, 0);
+
+			// This should contain the content from the previous two runs
+
+			HttpClient DefClient(fmt::format("http://localhost:{}", DefPort));
+
+			Result = DefClient.Get("/z$/ns1/b/0123456789abcdef0123456789abcdef01234567");
+			CHECK_EQ(Result.StatusCode, HttpResponseCode::OK);
+
+			CHECK_EQ(Result.AsText(), "AbcDef"sv);
+
+			Result = DefClient.Get("/z$/ns1/b/1123456789abcdef0123456789abcdef01234567");
+			CHECK_EQ(Result.StatusCode, HttpResponseCode::OK);
+
+			CHECK_EQ(Result.AsText(), "GhijklmNop"sv);
+		}
+
+		Result = Client.Post("modules/abc/deprovision");
+		REQUIRE(Result);
+
+		Result = Client.Post("modules/def/deprovision");
+		REQUIRE(Result);
+
+		// final sanity check that the hub is still responsive
+		Result = Client.Get("status");
+		CHECK(Result);
+	}
+}
+
+TEST_SUITE_END();
+
+TEST_CASE("hub.consul.lifecycle")
+{
+	zen::consul::ConsulProcess ConsulProc;
+	ConsulProc.SpawnConsulAgent();
+
+	zen::consul::ConsulClient Client("http://localhost:8500/");
+	Client.SetKeyValue("zen/hub/testkey", "testvalue");
+
+	std::string RetrievedValue = Client.GetKeyValue("zen/hub/testkey");
+	CHECK_EQ(RetrievedValue, "testvalue");
+
+	Client.DeleteKey("zen/hub/testkey");
+
+	ConsulProc.StopConsulAgent();
+}
+
+}  // namespace zen::tests::hub
+#endif
diff --git a/src/zenserver-test/projectstore-tests.cpp b/src/zenserver-test/projectstore-tests.cpp
index c8c96dbbb..735aef159 100644
--- a/src/zenserver-test/projectstore-tests.cpp
+++ b/src/zenserver-test/projectstore-tests.cpp
@@ -34,7 +34,7 @@ TEST_CASE("project.basic")
 	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 
 	ZenServerInstance Instance1(TestEnv);
-	Instance1.SetTestDir(TestDir);
+	Instance1.SetDataDir(TestDir);
 
 	const uint16_t PortNumber = Instance1.SpawnServerAndWaitUntilReady();
 
diff --git a/src/zenserver-test/workspace-tests.cpp b/src/zenserver-test/workspace-tests.cpp
index f299b6dcf..7595d790a 100644
--- a/src/zenserver-test/workspace-tests.cpp
+++ b/src/zenserver-test/workspace-tests.cpp
@@ -81,7 +81,7 @@ TEST_CASE("workspaces.create")
 
 	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 	ZenServerInstance	  Instance(TestEnv);
-	Instance.SetTestDir(TestDir);
+	Instance.SetDataDir(TestDir);
 	const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady(
 		fmt::format("--workspaces-enabled --workspaces-allow-changes --system-dir {}", SystemRootPath));
 	CHECK(PortNumber != 0);
@@ -214,7 +214,7 @@ TEST_CASE("workspaces.restricted")
 
 	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 	ZenServerInstance	  Instance(TestEnv);
-	Instance.SetTestDir(TestDir);
+	Instance.SetDataDir(TestDir);
 	const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady(fmt::format("--workspaces-enabled --system-dir {}", SystemRootPath));
 	CHECK(PortNumber != 0);
 
@@ -319,7 +319,7 @@ TEST_CASE("workspaces.lifetimes")
 	{
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 		ZenServerInstance	  Instance(TestEnv);
-		Instance.SetTestDir(TestDir);
+		Instance.SetDataDir(TestDir);
 		const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady(
 			fmt::format("--workspaces-enabled --workspaces-allow-changes --system-dir {}", SystemRootPath));
 		CHECK(PortNumber != 0);
@@ -343,7 +343,7 @@ TEST_CASE("workspaces.lifetimes")
 	{
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 		ZenServerInstance	  Instance(TestEnv);
-		Instance.SetTestDir(TestDir);
+		Instance.SetDataDir(TestDir);
 		const uint16_t PortNumber =
 			Instance.SpawnServerAndWaitUntilReady(fmt::format("--workspaces-enabled --system-dir {}", SystemRootPath));
 		CHECK(PortNumber != 0);
@@ -362,7 +362,7 @@ TEST_CASE("workspaces.lifetimes")
 	{
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 		ZenServerInstance	  Instance(TestEnv);
-		Instance.SetTestDir(TestDir);
+		Instance.SetDataDir(TestDir);
 		const uint16_t PortNumber =
 			Instance.SpawnServerAndWaitUntilReady(fmt::format("--workspaces-enabled --system-dir {}", SystemRootPath));
 		CHECK(PortNumber != 0);
diff --git a/src/zenserver-test/zenserver-test.cpp b/src/zenserver-test/zenserver-test.cpp
index 42296cbe1..9a42bb73d 100644
--- a/src/zenserver-test/zenserver-test.cpp
+++ b/src/zenserver-test/zenserver-test.cpp
@@ -17,6 +17,7 @@
 #	include <zencore/timer.h>
 #	include <zenhttp/httpclient.h>
 #	include <zenhttp/packageformat.h>
+#	include <zenutil/commandlineoptions.h>
 #	include <zenutil/logging/testformatter.h>
 #	include <zenutil/zenserverprocess.h>
 
@@ -61,9 +62,15 @@ zen::ZenServerEnvironment TestEnv;
 int
 main(int argc, char** argv)
 {
+#	if ZEN_PLATFORM_WINDOWS
+	setlocale(LC_ALL, "en_us.UTF8");
+#	endif	// ZEN_PLATFORM_WINDOWS
+
 	using namespace std::literals;
 	using namespace zen;
 
+	zen::CommandLineConverter ArgConverter(argc, argv);
+
 #	if ZEN_PLATFORM_LINUX
 	IgnoreChildSignals();
 #	endif
@@ -118,7 +125,7 @@ TEST_CASE("default.single")
 {
 	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 	ZenServerInstance	  Instance(TestEnv);
-	Instance.SetTestDir(TestDir);
+	Instance.SetDataDir(TestDir);
 	const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady();
 
 	std::atomic<uint64_t> RequestCount{0};
@@ -168,7 +175,7 @@ TEST_CASE("default.loopback")
 	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 
 	ZenServerInstance Instance(TestEnv);
-	Instance.SetTestDir(TestDir);
+	Instance.SetDataDir(TestDir);
 	const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady("--http-forceloopback");
 
 	ZEN_INFO("Running loopback server test...");
@@ -196,12 +203,12 @@ TEST_CASE("multi.basic")
 {
 	ZenServerInstance	  Instance1(TestEnv);
 	std::filesystem::path TestDir1 = TestEnv.CreateNewTestDir();
-	Instance1.SetTestDir(TestDir1);
+	Instance1.SetDataDir(TestDir1);
 	Instance1.SpawnServer();
 
 	ZenServerInstance	  Instance2(TestEnv);
 	std::filesystem::path TestDir2 = TestEnv.CreateNewTestDir();
-	Instance2.SetTestDir(TestDir2);
+	Instance2.SetDataDir(TestDir2);
 	Instance2.SpawnServer();
 
 	ZEN_INFO("Waiting...");
@@ -332,14 +339,14 @@ TEST_CASE("lifetime.owner")
 
 	ZenServerInstance	  Zen1(TestEnv);
 	std::filesystem::path TestDir1 = TestEnv.CreateNewTestDir();
-	Zen1.SetTestDir(TestDir1);
+	Zen1.SetDataDir(TestDir1);
 	Zen1.SpawnServer(PortNumber);
 	Zen1.WaitUntilReady();
 	Zen1.Detach();
 
 	ZenServerInstance	  Zen2(TestEnv);
 	std::filesystem::path TestDir2 = TestEnv.CreateNewTestDir();
-	Zen2.SetTestDir(TestDir2);
+	Zen2.SetDataDir(TestDir2);
 	Zen2.SpawnServer(PortNumber);
 	Zen2.WaitUntilReady();
 	Zen2.Detach();
@@ -358,24 +365,24 @@ TEST_CASE("lifetime.owner.2")
 	std::filesystem::path TestDir2 = TestEnv.CreateNewTestDir();
 
 	ZenServerInstance Zen1(TestEnv);
-	Zen1.SetTestDir(TestDir1);
+	Zen1.SetDataDir(TestDir1);
 	Zen1.SpawnServer(PortNumber);
 	Zen1.WaitUntilReady();
 
 	ZenServerInstance Zen2(TestEnv);
-	Zen2.SetTestDir(TestDir2);
+	Zen2.SetDataDir(TestDir2);
 	Zen2.SetOwnerPid(Zen1.GetPid());
 	Zen2.SpawnServer(PortNumber + 1);
 	Zen2.Detach();
 
 	ZenServerInstance Zen3(TestEnv);
-	Zen3.SetTestDir(TestDir2);
+	Zen3.SetDataDir(TestDir2);
 	Zen3.SetOwnerPid(Zen1.GetPid());
 	Zen3.SpawnServer(PortNumber + 1);
 	Zen3.Detach();
 
 	ZenServerInstance Zen4(TestEnv);
-	Zen4.SetTestDir(TestDir2);
+	Zen4.SetDataDir(TestDir2);
 	Zen4.SetOwnerPid(Zen1.GetPid());
 	Zen4.SpawnServer(PortNumber + 1);
 	Zen4.Detach();
diff --git a/src/zenserver-test/zenserver-test.h b/src/zenserver-test/zenserver-test.h
index e7cee3f94..8d83285e6 100644
--- a/src/zenserver-test/zenserver-test.h
+++ b/src/zenserver-test/zenserver-test.h
@@ -82,7 +82,7 @@ namespace utils {
 
 		void Spawn(ZenServerInstance& Inst)
 		{
-			Inst.SetTestDir(DataDir);
+			Inst.SetDataDir(DataDir);
 			Inst.SpawnServer(Port, Args);
 			const uint16_t InstancePort = Inst.WaitUntilReady();
 			CHECK_MESSAGE(InstancePort != 0, Inst.GetLogOutput());
@@ -163,7 +163,7 @@ public:
 		{
 			auto& Instance = m_Instances[i];
 			Instance	   = std::make_unique<ZenServerInstance>(TestEnv);
-			Instance->SetTestDir(TestEnv.CreateNewTestDir());
+			Instance->SetDataDir(TestEnv.CreateNewTestDir());
 		}
 
 		for (int i = 0; i < m_ServerCount; ++i)