aboutsummaryrefslogtreecommitdiff
path: root/zenserver-test/zenserver-test.cpp
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2021-11-29 13:51:53 +0100
committerMartin Ridgers <[email protected]>2021-11-29 13:51:53 +0100
commit9e35be45fb6f3a6d7c356c83fb9e88338704fcbe (patch)
tree9313c5cbc59fe2b85f0cb26fae65d7a8a475d300 /zenserver-test/zenserver-test.cpp
parentRemoved the special-case path handling to make project tests pass (diff)
downloadzen-9e35be45fb6f3a6d7c356c83fb9e88338704fcbe.tar.xz
zen-9e35be45fb6f3a6d7c356c83fb9e88338704fcbe.zip
Wait for upstream test server to start before spawning a downstream one
Diffstat (limited to 'zenserver-test/zenserver-test.cpp')
-rw-r--r--zenserver-test/zenserver-test.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index d19de95db..20650ba56 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -1373,14 +1373,13 @@ TEST_CASE("zcache.cbpackage")
ZenServerInstance RemoteInstance(TestEnv);
RemoteInstance.SetTestDir(RemoteDataDir);
RemoteInstance.SpawnServer(RemotePortNumber);
+ RemoteInstance.WaitUntilReady();
ZenServerInstance LocalInstance(TestEnv);
LocalInstance.SetTestDir(LocalDataDir);
LocalInstance.SpawnServer(LocalPortNumber,
"--upstream-thread-count=0 --upstream-zen-url=http://localhost:{}"_format(RemotePortNumber));
-
LocalInstance.WaitUntilReady();
- RemoteInstance.WaitUntilReady();
const std::string_view Bucket = "mosdef"sv;
zen::IoHash Key;
@@ -1437,14 +1436,13 @@ TEST_CASE("zcache.cbpackage")
ZenServerInstance RemoteInstance(TestEnv);
RemoteInstance.SetTestDir(RemoteDataDir);
RemoteInstance.SpawnServer(RemotePortNumber);
+ RemoteInstance.WaitUntilReady();
ZenServerInstance LocalInstance(TestEnv);
LocalInstance.SetTestDir(LocalDataDir);
LocalInstance.SpawnServer(LocalPortNumber,
"--upstream-thread-count=0 --upstream-zen-url=http://localhost:{}"_format(RemotePortNumber));
-
LocalInstance.WaitUntilReady();
- RemoteInstance.WaitUntilReady();
const std::string_view Bucket = "mosdef"sv;
zen::IoHash Key;