Skip to content

Commit 9515de6

Browse files
Fix .NET E2E test
1 parent 83653c2 commit 9515de6

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

dotnet/test/Harness/TestHelper.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ public static class TestHelper
88
{
99
public static async Task<AssistantMessageEvent?> GetFinalAssistantMessageAsync(
1010
CopilotSession session,
11-
TimeSpan? timeout = null)
11+
TimeSpan? timeout = null,
12+
bool alreadyIdle = false)
1213
{
1314
var tcs = new TaskCompletionSource<AssistantMessageEvent>(TaskCreationOptions.RunContinuationsAsynchronously);
1415
using var cts = new CancellationTokenSource(timeout ?? TimeSpan.FromSeconds(60));
@@ -42,7 +43,7 @@ async void CheckExistingMessages()
4243
{
4344
try
4445
{
45-
var existing = await GetExistingFinalResponseAsync(session);
46+
var existing = await GetExistingFinalResponseAsync(session, alreadyIdle);
4647
if (existing != null) tcs.TrySetResult(existing);
4748
}
4849
catch (Exception ex)
@@ -52,7 +53,7 @@ async void CheckExistingMessages()
5253
}
5354
}
5455

55-
private static async Task<AssistantMessageEvent?> GetExistingFinalResponseAsync(CopilotSession session)
56+
private static async Task<AssistantMessageEvent?> GetExistingFinalResponseAsync(CopilotSession session, bool alreadyIdle)
5657
{
5758
var messages = (await session.GetMessagesAsync()).ToList();
5859

@@ -62,7 +63,7 @@ async void CheckExistingMessages()
6263
var error = currentTurn.OfType<SessionErrorEvent>().FirstOrDefault();
6364
if (error != null) throw new Exception(error.Data.Message ?? "session error");
6465

65-
var idleIdx = currentTurn.FindIndex(m => m is SessionIdleEvent);
66+
var idleIdx = alreadyIdle ? currentTurn.Count : currentTurn.FindIndex(m => m is SessionIdleEvent);
6667
if (idleIdx == -1) return null;
6768

6869
for (var i = idleIdx - 1; i >= 0; i--)

dotnet/test/SessionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public async Task Should_Resume_A_Session_Using_The_Same_Client()
196196
var session2 = await ResumeSessionAsync(sessionId);
197197
Assert.Equal(sessionId, session2.SessionId);
198198

199-
var answer2 = await TestHelper.GetFinalAssistantMessageAsync(session2);
199+
var answer2 = await TestHelper.GetFinalAssistantMessageAsync(session2, alreadyIdle: true);
200200
Assert.NotNull(answer2);
201201
Assert.Contains("2", answer2!.Data.Content ?? string.Empty);
202202

0 commit comments

Comments
 (0)