Skip to content

Add explicit-start shutdown regression coverage (startup-token cancellation and process exit) #21397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
David Fowler (davidfowl) wants to merge 2 commits into
base: main
Choose a base branch
from
+24 −5
Open

Add explicit-start shutdown regression coverage (startup-token cancellation and process exit) #21397

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d28c36f
Fix explicit-start test shutdown cancellation ownership
davidfowl Oct 29, 2026
12f4c50
Merge remote-tracking branch 'origin/main' into pr21397
davidfowl Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,10 @@ public async Task ExplicitStart_StartExecutable()
await app.StopAsync(token).DefaultTimeout(TestConstants.LongTimeoutTimeSpan);
}

[Fact]
public async Task BeforeResourceStartedEvent_NotFiredForExplicitStartOnInitialCreation()
[Theory]
[InlineData(false)]
[InlineData(true)]
public async Task BeforeResourceStartedEvent_NotFiredForExplicitStartOnInitialCreation(bool cancelStartupAfterStart)
{
const string testName = "before-start-event-explicit-start";
using var testProgram = CreateTestProgram(testName, randomizePorts: false);
Expand Down Expand Up @@ -343,14 +345,13 @@ public async Task BeforeResourceStartedEvent_NotFiredForExplicitStartOnInitialCr
using var startupCts = new CancellationTokenSource(TestConstants.LongTimeoutTimeSpan);
var startupToken = startupCts.Token;

// Start app in background - it won't complete because of explicit start resource
_ = app.StartAsync(startupToken);
var startTask = app.StartAsync(startupToken);

var normalResourceName = $"{testName}-serviceb";
var explicitStartResourceName = $"{testName}-servicea";

// Wait for normal resource to be running
await rns.WaitForResourceAsync(normalResourceName, e => e.Snapshot.State?.Text == KnownResourceStates.Running, startupToken).DefaultTimeout(TestConstants.LongTimeoutTimeSpan);
var normalResource = await rns.WaitForResourceAsync(normalResourceName, e => e.Snapshot.State?.Text == KnownResourceStates.Running, startupToken).DefaultTimeout(TestConstants.LongTimeoutTimeSpan);

// Wait for explicit start resource to be NotStarted
await rns.WaitForResourceAsync(explicitStartResourceName, e => e.Snapshot.State?.Text == KnownResourceStates.NotStarted, startupToken).DefaultTimeout(TestConstants.LongTimeoutTimeSpan);
Expand All @@ -362,8 +363,26 @@ public async Task BeforeResourceStartedEvent_NotFiredForExplicitStartOnInitialCr
Assert.Equal(1, normalEventCount);
Assert.Equal(0, explicitStartEventCount);

await startTask.DefaultTimeout(TestConstants.LongTimeoutTimeSpan);

var servicePid = Assert.IsType<int>(GetResourcePropertyValue(normalResource, KnownProperties.Executable.Pid));
using var serviceProcess = Process.GetProcessById(servicePid);
Assert.False(serviceProcess.HasExited);
var lifetime = app.Services.GetRequiredService<IHostApplicationLifetime>();
Assert.False(lifetime.ApplicationStopped.IsCancellationRequested);

if (cancelStartupAfterStart)
{
// Exercise an expired startup budget deterministically, after startup has settled.
startupCts.Cancel();
}

// A slow startup must not consume the shutdown phase's cancellation budget.
Comment thread
davidfowl marked this conversation as resolved.
Resolved
using var stopCts = new CancellationTokenSource(TestConstants.LongTimeoutTimeSpan);
await app.StopAsync(stopCts.Token).DefaultTimeout(TestConstants.LongTimeoutTimeSpan);
await serviceProcess.WaitForExitAsync(stopCts.Token).DefaultTimeout(TestConstants.LongTimeoutTimeSpan);
Assert.True(serviceProcess.HasExited);
Assert.True(lifetime.ApplicationStopped.IsCancellationRequested);
}

[Fact]
Expand Down
Loading