dohertj2/ScadaBridge
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

test(e2e): guard DeploymentFixture partial-init + teardown (review fixes)

Browse Source
This commit is contained in:
Joseph Doherty
2026-06-05 10:30:16 -04:00
parent 19c4412fd1
commit 8e11f1f900
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ZB.MOM.WW.ScadaBridge.CentralUI.PlaywrightTests/Deployment/DeploymentFixture.cs
+19 -6
View File
@@ -77,10 +77,22 @@ public sealed class DeploymentFixture : IAsyncLifetime
return;
}
SiteAId = await CliRunner.ResolveSiteIdAsync(SiteAIdentifier);
TemplateId = await CliRunner.CreateTemplateAsync(CliRunner.UniqueName("deploytmpl"));
await CliRunner.AddAttributeAsync(TemplateId, "Value", "Double");
AreaId = await CliRunner.CreateAreaAsync(SiteAId, CliRunner.UniqueName("area"));
try
{
SiteAId = await CliRunner.ResolveSiteIdAsync(SiteAIdentifier);
TemplateId = await CliRunner.CreateTemplateAsync(CliRunner.UniqueName("deploytmpl"));
await CliRunner.AddAttributeAsync(TemplateId, "Value", "Double");
AreaId = await CliRunner.CreateAreaAsync(SiteAId, CliRunner.UniqueName("area"));
}
catch
{
// Partial-init guard: best-effort cleanup of whatever was created before
// the failure; DeleteAreaAsync/DeleteTemplateAsync are no-ops for id 0.
await CliRunner.DeleteAreaAsync(AreaId);
await CliRunner.DeleteTemplateAsync(TemplateId);
Available = false;
throw;
}
}
/// <summary>
@@ -104,6 +116,7 @@ public sealed class DeploymentFixture : IAsyncLifetime
public async Task<(int Id, string UniqueName)> CreateInstanceAsync()
{
var inv = System.Globalization.CultureInfo.InvariantCulture;
// "inst" must match the InstanceNamePrefix ("zztest-inst-") used by the teardown sweep.
var name = CliRunner.UniqueName("inst");
using var doc = await CliRunner.RunJsonAsync(
@@ -154,8 +167,8 @@ public sealed class DeploymentFixture : IAsyncLifetime
// Best-effort teardown — never fail the suite on a cleanup hiccup.
}
await CliRunner.DeleteAreaAsync(AreaId);
await CliRunner.DeleteTemplateAsync(TemplateId);
try { await CliRunner.DeleteAreaAsync(AreaId); } catch { }
try { await CliRunner.DeleteTemplateAsync(TemplateId); } catch { }
}
/// <summary>