Skip to content
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

Jump to bottom

Enable GetAsync_CancelDuringResponseBodyReceived_Buffered_TaskCanceledQuickly #32032

Closed
wants to merge 10 commits into from
Closed

Enable GetAsync_CancelDuringResponseBodyReceived_Buffered_TaskCanceledQuickly #32032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4171286
Test GetAsync_CancelDuringResponseBodyReceived_Buffered_TaskCanceledQ…
alnikola Feb 10, 2020
7a6aaba
Http11LoopbackServerFactory respects the specified timeout
alnikola Feb 11, 2020
e683398
Test timeout increased
alnikola Feb 12, 2020
395a5cf
[Investigation] HttpClient's timeout is set
alnikola Feb 12, 2020
499748b
More timeouts
alnikola Feb 12, 2020
0a9be2e
Timeout increased to 5 mins
alnikola Feb 13, 2020
9dbe30c
Per operation timeouts removed
alnikola Feb 13, 2020
2ccf398
Timeout increased to 500000 ms
alnikola Feb 14, 2020
20cf1b9
Timing out test investigation
alnikola Feb 18, 2020
31a1e93
Timing out code investigation 2
alnikola Feb 18, 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
12 changes: 6 additions & 6 deletions src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Cancellation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ await ValidateClientCancellationAsync(async () =>
}

[Theory]
[ActiveIssue("https://github.com/dotnet/corefx/issues/28805")]
[MemberData(nameof(TwoBoolsAndCancellationMode))]
public async Task GetAsync_CancelDuringResponseBodyReceived_Buffered_TaskCanceledQuickly(bool chunkedTransfer, bool connectionClose, CancellationMode mode)
{
Expand All @@ -140,6 +139,7 @@ public async Task GetAsync_CancelDuringResponseBodyReceived_Buffered_TaskCancele
{
client.Timeout = Timeout.InfiniteTimeSpan;
var cts = new CancellationTokenSource();
int timeout = 120_000;

await LoopbackServerFactory.CreateServerAsync(async (server, url) =>
{
Expand Down Expand Up @@ -167,18 +167,18 @@ await ValidateClientCancellationAsync(async () =>
req.Headers.ConnectionClose = connectionClose;

Task<HttpResponseMessage> getResponse = client.SendAsync(req, HttpCompletionOption.ResponseContentRead, cts.Token);
await responseHeadersSent.Task;
await Task.Delay(1); // make it more likely that client will have started processing response body
await responseHeadersSent.Task.TimeoutAfter(timeout);
//await Task.Delay(1).TimeoutAfter(timeout); // make it more likely that client will have started processing response body
Cancel(mode, client, cts);
await getResponse;
});
await getResponse.TimeoutAfter(timeout);
}).TimeoutAfter(timeout);

try
{
clientFinished.SetResult(true);
await serverTask;
} catch { }
});
}, 500_000);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ public override GenericLoopbackServer CreateServer(GenericLoopbackOptions option

public override Task CreateServerAsync(Func<GenericLoopbackServer, Uri, Task> funcAsync, int millisecondsTimeout = 60_000, GenericLoopbackOptions options = null)
{
return LoopbackServer.CreateServerAsync((server, uri) => funcAsync(server, uri), options: CreateOptions(options));
return LoopbackServer.CreateServerAsync((server, uri) => funcAsync(server, uri).TimeoutAfter(millisecondsTimeout), options: CreateOptions(options));
}

private static LoopbackServer.Options CreateOptions(GenericLoopbackOptions options)
Expand Down