Skip to content

[automated] Merge branch 'release/3.1' => 'master' #20150

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
merged 7 commits into from
Mar 26, 2020
Merged

[automated] Merge branch 'release/3.1' => 'master' #20150

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e9e66d8
Merge pull request #19676 from dotnet/dougbu/2.1/newer.agents.3540
dougbu Mar 25, 2020
7582cfc
Merge pull request #19675 from dotnet/dougbu/3.1/newer.agents.3540
dougbu Mar 25, 2020
d7c205d
Merge remote-tracking branch 'origin/release/2.1' into merge/release/…
dougbu Mar 25, 2020
9514a86
[SignalR] Avoid deadlock with closing and user callbacks (#19612) (#1…
BrennanConroy Mar 25, 2020
405b021
Merge pull request #20144 from dotnet-maestro-bot/merge/release/2.1-t…
dougbu Mar 25, 2020
52065f4
Merge branch 'master' into merge/release/3.1-to-master
dougbu Mar 25, 2020
8ad805b
Unskip targeting pack tests
wtgodbe Mar 25, 2020
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
13 changes: 3 additions & 10 deletions src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,22 +448,15 @@ public async Task CanAwaitInvokeFromOnHandlerWithServerClosingConnection()
return Task.CompletedTask;
};

await connection.ReceiveJsonMessage(new { type = HubProtocolConstants.InvocationMessageType, target = "Echo", arguments = new object[] { "42" } });
await connection.ReceiveJsonMessage(new { type = HubProtocolConstants.InvocationMessageType, target = "Echo", arguments = new object[] { "42" } }).OrTimeout();

// Read sent message first to make sure invoke has been processed and is waiting for a response
await connection.ReadSentJsonAsync().OrTimeout();
await connection.ReceiveJsonMessage(new { type = HubProtocolConstants.CloseMessageType });
await connection.ReceiveJsonMessage(new { type = HubProtocolConstants.CloseMessageType }).OrTimeout();

await closedTcs.Task.OrTimeout();

try
{
await tcs.Task.OrTimeout();
Assert.True(false);
}
catch (TaskCanceledException)
{
}
await Assert.ThrowsAsync<TaskCanceledException>(() => tcs.Task.OrTimeout());
}
}

Expand Down