zenserverprocess hardening (#61)

* verify running process before creating event
* make sure we don't signal/wait for a zenserver instance that we did not wait for to get ready

1 files changed, 10 insertions, 4 deletions

diff --git a/src/zenserver-test/zenserver-test.cpp b/src/zenserver-test/zenserver-test.cpp
index d6671c885..4675ede38 100644
--- a/src/zenserver-test/zenserver-test.cpp
+++ b/src/zenserver-test/zenserver-test.cpp
@@ -2551,19 +2551,25 @@ public:
 		for (int i = 0; i < m_ServerCount; ++i)
 		{
 			auto& Instance = m_Instances[i];
-
-			Instance = std::make_unique<ZenServerInstance>(TestEnv);
+			Instance	   = std::make_unique<ZenServerInstance>(TestEnv);
 			Instance->SetTestDir(TestEnv.CreateNewTestDir());
+		}
 
+		for (int i = 0; i < m_ServerCount; ++i)
+		{
+			auto& Instance = m_Instances[i];
 			Callback(*Instance);
-
-			Instance->SpawnServer(TestEnv.GetNewPortNumber(), AdditionalServerArgs);
 		}
 
 		for (int i = 0; i < m_ServerCount; ++i)
 		{
 			auto& Instance = m_Instances[i];
+			Instance->SpawnServer(TestEnv.GetNewPortNumber(), AdditionalServerArgs);
+		}
 
+		for (int i = 0; i < m_ServerCount; ++i)
+		{
+			auto&	 Instance	= m_Instances[i];
 			uint16_t PortNumber = Instance->WaitUntilReady();
 			CHECK_MESSAGE(PortNumber != 0, Instance->GetLogOutput());
 		}