reduce test runtime (#933)

* reduce zenserver spawns in tests
* fix filesystemutils wrong test suite name
* tweak tests for faster runtime
* reduce more test runtime
* more wall time improvements
* fast http and processmanager tests

1 files changed, 155 insertions, 16 deletions

diff --git a/src/zenutil/process/subprocessmanager.cpp b/src/zenutil/process/subprocessmanager.cpp
index e908dd63a..597df3c15 100644
--- a/src/zenutil/process/subprocessmanager.cpp
+++ b/src/zenutil/process/subprocessmanager.cpp
@@ -1209,7 +1209,17 @@ TEST_CASE("SubprocessManager.SpawnAndDetectExit")
 		CallbackFired	 = true;
 	});
 
-	IoContext.run_for(5s);
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (CallbackFired)
+			{
+				break;
+			}
+		}
+	}
 
 	CHECK(CallbackFired);
 	CHECK(ReceivedExitCode == 42);
@@ -1234,7 +1244,17 @@ TEST_CASE("SubprocessManager.SpawnAndDetectCleanExit")
 		CallbackFired	 = true;
 	});
 
-	IoContext.run_for(5s);
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (CallbackFired)
+			{
+				break;
+			}
+		}
+	}
 
 	CHECK(CallbackFired);
 	CHECK(ReceivedExitCode == 0);
@@ -1259,7 +1279,17 @@ TEST_CASE("SubprocessManager.StdoutCapture")
 
 	ManagedProcess* Proc = Manager.Spawn(AppStub, CmdLine, Options, [&](ManagedProcess&, int) { Exited = true; });
 
-	IoContext.run_for(5s);
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (Exited)
+			{
+				break;
+			}
+		}
+	}
 
 	CHECK(Exited);
 	std::string Captured = Proc->GetCapturedStdout();
@@ -1288,7 +1318,17 @@ TEST_CASE("SubprocessManager.StderrCapture")
 
 	ManagedProcess* Proc = Manager.Spawn(AppStub, CmdLine, Options, [&](ManagedProcess&, int) { Exited = true; });
 
-	IoContext.run_for(5s);
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (Exited)
+			{
+				break;
+			}
+		}
+	}
 
 	CHECK(Exited);
 	std::string CapturedErr = Proc->GetCapturedStderr();
@@ -1320,7 +1360,17 @@ TEST_CASE("SubprocessManager.StdoutCallback")
 		[&](ManagedProcess&, int) { Exited = true; },
 		[&](ManagedProcess&, std::string_view Data) { ReceivedData.append(Data); });
 
-	IoContext.run_for(5s);
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (Exited)
+			{
+				break;
+			}
+		}
+	}
 
 	CHECK(Exited);
 	CHECK(ReceivedData.find("callback_test") != std::string::npos);
@@ -1343,8 +1393,18 @@ TEST_CASE("SubprocessManager.MetricsSampling")
 
 	ManagedProcess* Proc = Manager.Spawn(AppStub, CmdLine, Options, [&](ManagedProcess&, int) { Exited = true; });
 
-	// Run for enough time to get metrics samples
-	IoContext.run_for(1s);
+	// Poll until metrics are available
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (Proc->GetLatestMetrics().WorkingSetSize > 0)
+			{
+				break;
+			}
+		}
+	}
 
 	ProcessMetrics Metrics = Proc->GetLatestMetrics();
 	CHECK(Metrics.WorkingSetSize > 0);
@@ -1353,7 +1413,17 @@ TEST_CASE("SubprocessManager.MetricsSampling")
 	CHECK(Snapshot.size() == 1);
 
 	// Let it finish
-	IoContext.run_for(3s);
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 10'000)
+		{
+			IoContext.run_for(10ms);
+			if (Exited)
+			{
+				break;
+			}
+		}
+	}
 	CHECK(Exited);
 }
 
@@ -1402,12 +1472,31 @@ TEST_CASE("SubprocessManager.KillAndWaitForExit")
 	ManagedProcess* Proc = Manager.Spawn(AppStub, CmdLine, Options, [&](ManagedProcess&, int) { CallbackFired = true; });
 
 	// Let it start
-	IoContext.run_for(200ms);
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (Proc->IsRunning())
+			{
+				break;
+			}
+		}
+	}
 
 	Proc->Kill();
 
-	IoContext.run_for(2s);
-
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (CallbackFired)
+			{
+				break;
+			}
+		}
+	}
 	CHECK(CallbackFired);
 }
 
@@ -1428,7 +1517,17 @@ TEST_CASE("SubprocessManager.AdoptProcess")
 
 	Manager.Adopt(ProcessHandle(Result), [&](ManagedProcess&, int ExitCode) { ReceivedExitCode = ExitCode; });
 
-	IoContext.run_for(5s);
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (ReceivedExitCode != -1)
+			{
+				break;
+			}
+		}
+	}
 
 	CHECK(ReceivedExitCode == 7);
 }
@@ -1451,7 +1550,17 @@ TEST_CASE("SubprocessManager.UserTag")
 	Proc->SetTag("my-worker-1");
 	CHECK(Proc->GetTag() == "my-worker-1");
 
-	IoContext.run_for(5s);
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (!ReceivedTag.empty())
+			{
+				break;
+			}
+		}
+	}
 
 	CHECK(ReceivedTag == "my-worker-1");
 }
@@ -1481,7 +1590,17 @@ TEST_CASE("ProcessGroup.SpawnAndMembership")
 	CHECK(Group->GetProcessCount() == 2);
 	CHECK(Manager.GetProcessCount() == 2);
 
-	IoContext.run_for(5s);
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (ExitCount == 2)
+			{
+				break;
+			}
+		}
+	}
 
 	CHECK(ExitCount == 2);
 }
@@ -1531,7 +1650,17 @@ TEST_CASE("ProcessGroup.AggregateMetrics")
 	Group->Spawn(AppStub, CmdLine, Options, [](ManagedProcess&, int) {});
 
 	// Wait for metrics sampling
-	IoContext.run_for(1s);
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (Group->GetAggregateMetrics().TotalWorkingSetSize > 0)
+			{
+				break;
+			}
+		}
+	}
 
 	AggregateProcessMetrics GroupAgg = Group->GetAggregateMetrics();
 	CHECK(GroupAgg.ProcessCount == 2);
@@ -1597,7 +1726,17 @@ TEST_CASE("ProcessGroup.MixedGroupedAndUngrouped")
 	CHECK(Group->GetProcessCount() == 2);
 	CHECK(Manager.GetProcessCount() == 3);
 
-	IoContext.run_for(5s);
+	{
+		Stopwatch Timer;
+		while (Timer.GetElapsedTimeMs() < 5'000)
+		{
+			IoContext.run_for(10ms);
+			if (GroupExitCount == 2 && UngroupedExitCode != -1)
+			{
+				break;
+			}
+		}
+	}
 
 	CHECK(GroupExitCount == 2);
 	CHECK(UngroupedExitCode == 0);