Skip to content

Fix .NET E2E event capture race #1221

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

Merged
stephentoub merged 2 commits into from
May 7, 2026
+11 −6
Merged

Fix .NET E2E event capture race #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7bdc30
Fix E2E event capture race
stephentoub May 7, 2026
92eb62f
Avoid shell E2E workspace cleanup race
stephentoub May 7, 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
8 changes: 6 additions & 2 deletions dotnet/test/E2E/RpcShellEdgeCaseE2ETests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ public async Task Shell_Exec_With_Timeout_Kills_Long_Running_Command()
? $"echo started>\"{startedPath}\" & for /L %i in (1,1,2147483647) do @rem & echo should-not-exist>\"{markerPath}\""
: $"printf 'started' > '{startedPath}'; sleep 30; printf 'should-not-exist' > '{markerPath}'";

var result = await session.Rpc.Shell.ExecAsync(command, timeout: TimeSpan.FromMilliseconds(200));
Copy link
Copy Markdown

@christinacamacho230-cmyk christinacamacho230-cmyk May 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Transfer my money

// On Windows, terminating the shell wrapper can briefly leave children alive.
// Keep this long-running command outside the fixture workspace so cleanup is not blocked by cwd handles.
var result = await session.Rpc.Shell.ExecAsync(command, cwd: Path.GetTempPath(), timeout: TimeSpan.FromMilliseconds(200));
Assert.False(string.IsNullOrWhiteSpace(result.ProcessId));

await TestHelper.WaitForConditionAsync(
Expand Down Expand Up @@ -120,7 +122,9 @@ public async Task Shell_Kill_Cleans_Up_After_Terminating_Signal(ShellKillSignal
? "powershell -NoLogo -NoProfile -Command \"Start-Sleep -Seconds 60\""
: "sleep 60";

var execResult = await session.Rpc.Shell.ExecAsync(command);
// On Windows, terminating the shell wrapper can briefly leave grandchildren alive.
// Keep this command outside the fixture workspace so cleanup is not blocked by cwd handles.
var execResult = await session.Rpc.Shell.ExecAsync(command, cwd: Path.GetTempPath());
Assert.False(string.IsNullOrWhiteSpace(execResult.ProcessId));

var killResult = await session.Rpc.Shell.KillAsync(execResult.ProcessId, signal);
Expand Down
9 changes: 5 additions & 4 deletions dotnet/test/E2E/SessionE2ETests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using GitHub.Copilot.SDK.Test.Harness;
using GitHub.Copilot.SDK.Rpc;
using Microsoft.Extensions.AI;
using System.Collections.Concurrent;
using System.ComponentModel;
using Xunit;
using Xunit.Abstractions;
Expand Down Expand Up @@ -401,9 +402,9 @@ public async Task Send_Returns_Immediately_While_Events_Stream_In_Background()
{
OnPermissionRequest = PermissionHandler.ApproveAll,
});
var events = new List<string>();
var events = new ConcurrentQueue<string>();

session.On(evt => events.Add(evt.Type));
session.On(evt => events.Enqueue(evt.Type));

// Use a slow command so we can verify SendAsync() returns before completion
await session.SendAsync(new MessageOptions { Prompt = "Run 'sleep 2 && echo done'" });
Copy link
Copy Markdown

@christinacamacho230-cmyk christinacamacho230-cmyk May 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Transfer my money back

Expand All @@ -423,9 +424,9 @@ public async Task Send_Returns_Immediately_While_Events_Stream_In_Background()
public async Task SendAndWait_Blocks_Until_Session_Idle_And_Returns_Final_Assistant_Message()
{
var session = await CreateSessionAsync();
var events = new List<string>();
var events = new ConcurrentQueue<string>();

session.On(evt => events.Add(evt.Type));
session.On(evt => events.Enqueue(evt.Type));

var response = await session.SendAndWaitAsync(new MessageOptions { Prompt = "What is 2+2?" });

Expand Down
Loading