test: replace fixed waits with observable GUI readiness

Advance integration drivers only after their requested controls, game state or file effects are observable. Preserve the behavioral assertions and shared viewport capture pipeline.
This commit is contained in:
cthangover committed 2026-11-13 17:48:45 +01:00
1 parent a82130edb0
commit 18c58fd117
5 files changed
+123 -20

No files matched your search

@@ -36,6 +36,9 @@ namespace Mods.NewGameTest
/// </summary>
public partial class NewGameTestDriverNode : Node
{
private int readinessToken = int.MinValue;
private ulong readinessStarted;
private ulong readinessFrame;
public const string Flag = "--itest=new_game";
private const string MainGame = "cthangover";
@@ -49,7 +52,6 @@ namespace Mods.NewGameTest
private int passed;
private int step;
private double elapsed;
private double stepAt;
private bool done;
private bool sawMarao;
private int clicks;
@@ -67,6 +69,7 @@ namespace Mods.NewGameTest
ModEventBus.Unsubscribe<SceneEnteredEvent>(OnSceneEntered);
}
/// <summary>Advances when observable scene/UI readiness has held for two real frames; the watchdog remains active.</summary>
public override void _Process(double delta)
{
if (done)
@@ -80,9 +83,6 @@ namespace Mods.NewGameTest
return;
}
if (elapsed - stepAt < 0.25)
return;
stepAt = elapsed;
try
{
@@ -101,8 +101,26 @@ namespace Mods.NewGameTest
private void OnSceneEntered(SceneEnteredEvent e) => enteredScenes.Add(e.SceneName);
// Deferred UI/scene work must finish before the original assertions run.
private bool WaitForReadyFrames(int token, bool ready, double timeoutSeconds = 30)
{
var now = global::Godot.Time.GetTicksMsec();
if (readinessToken != token)
{
readinessToken = token;
readinessStarted = now;
readinessFrame = 0;
}
if (now - readinessStarted > timeoutSeconds * 1000)
throw new global::System.TimeoutException($"readiness at step {token}: scene/UI did not become ready");
if (!ready) { readinessFrame = 0; return false; }
if (readinessFrame == 0) readinessFrame = global::Godot.Engine.GetProcessFrames();
return global::Godot.Engine.GetProcessFrames() - readinessFrame >= 2;
}
private void RunStep()
{
if (!WaitForReadyFrames(step, Boot.IsReady && Menu != null && !Busy && (step != 0 || Menu is not Cthangover.BaseMenu.MainMenu || !GameSession.IsWarmingUp), TimeoutSeconds)) return;
switch (step)
{
case 0: