diff options
| author | Stefan Boberg <[email protected]> | 2026-01-19 14:46:42 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2026-01-19 14:46:42 +0100 |
| commit | 155271b7e541705bab782c0b75ed09050a56fcf8 (patch) | |
| tree | daff96788a7dda7dbc9adbb68a5daae2f2fc0af4 /src/zenserver-test/cache-tests.cpp | |
| parent | remove ZENCORE_API completely (#718) (diff) | |
| download | zen-155271b7e541705bab782c0b75ed09050a56fcf8.tar.xz zen-155271b7e541705bab782c0b75ed09050a56fcf8.zip | |
ZenServerProcess API changes (#719)
This refactor aims to improve the `ZenServerProcess` classes by making them useful for managing child zenserver instances in more scenarios than just automated tests. This involves changing some functions to not talk about "test directory" and instead use "data directory" etc
As a consequence of the API changes, some tests have changed accordingly.
The code includes som reference to the "hub" mode but there is not yet any other code using this mode, it's just included in this PR to simplify future merges.
Diffstat (limited to 'src/zenserver-test/cache-tests.cpp')
| -rw-r--r-- | src/zenserver-test/cache-tests.cpp | 20 |
1 files changed, 10 insertions, 10 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); |