diff --git a/test/Compliance.Tests/E2E/SplitHostTenantE2ETests.cs b/test/Compliance.Tests/E2E/SplitHostTenantE2ETests.cs index 7abb380..9a6aa57 100644 --- a/test/Compliance.Tests/E2E/SplitHostTenantE2ETests.cs +++ b/test/Compliance.Tests/E2E/SplitHostTenantE2ETests.cs @@ -267,9 +267,17 @@ await TenantInvitationE2ETests.VerifyEmailAsync(factory, creator, creatorId, ema await Task.Delay(250); } Assert.Equal(HttpStatusCode.OK, access); - using var tenantResponse = await creator.GetAsync($"/api/v1/tenants/{tenantId}"); - Assert.Equal(HttpStatusCode.OK, tenantResponse.StatusCode); - var tenant = await tenantResponse.Content.ReadFromJsonAsync(); + Tenant? tenant = null; + deadline = DateTimeOffset.UtcNow.AddSeconds(45); + while (DateTimeOffset.UtcNow < deadline) + { + using var tenantResponse = await creator.GetAsync($"/api/v1/tenants/{tenantId}"); + Assert.Equal(HttpStatusCode.OK, tenantResponse.StatusCode); + tenant = await tenantResponse.Content.ReadFromJsonAsync(); + if (tenant?.Status == "active") + break; + await Task.Delay(250); + } Assert.Equal("active", tenant?.Status); Assert.Null(tenant?.OperatorUserId); using var outsiderDenied = await outsider.GetAsync( @@ -790,6 +798,7 @@ await TenantInvitationE2ETests.VerifyEmailAsync(factory, administratorClient, new { email_address = administratorEmail, token = invitationToken }); Assert.Equal(HttpStatusCode.NoContent, accepted.StatusCode); + deadline = DateTimeOffset.UtcNow.AddSeconds(45); var access = HttpStatusCode.Forbidden; while (DateTimeOffset.UtcNow < deadline) { @@ -825,6 +834,7 @@ await TenantInvitationE2ETests.VerifyEmailAsync(factory, staffClient, staffId, s using var staffAccepted = await staffClient.PostAsJsonAsync(acceptancePath, new { email_address = staffEmail, token = staffToken }); Assert.Equal(HttpStatusCode.NoContent, staffAccepted.StatusCode); + deadline = DateTimeOffset.UtcNow.AddSeconds(45); Members? members = null; while (DateTimeOffset.UtcNow < deadline) {