Skip to content

increase timeout on ZeroByteRead_IssuesZeroByteReadOnUnderlyingStream test #73196

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
wfurt merged 3 commits into from
Aug 4, 2022
Merged

increase timeout on ZeroByteRead_IssuesZeroByteReadOnUnderlyingStream test #73196

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
148dd2f
increase timeout on ZeroByteRead_IssuesZeroByteReadOnUnderlyingStream…
wfurt Aug 1, 2022
ab25dc2
feedback from review
wfurt Aug 2, 2022
21cbbd5
feedback from review
wfurt Aug 2, 2022
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/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,29 +114,29 @@ public async Task ZeroByteRead_IssuesZeroByteReadOnUnderlyingStream(StreamConfor
cert,
clientCertificateRequired: true,
enabledSslProtocols: SslProtocols.Tls12,
checkCertificateRevocation: false).WaitAsync(TimeSpan.FromSeconds(10));
checkCertificateRevocation: false).WaitAsync(TestHelper.PassingTestTimeout);
}
}

await ResponseConnectedStreamConformanceTests.ReadHeadersAsync(server).WaitAsync(TimeSpan.FromSeconds(10));
await ResponseConnectedStreamConformanceTests.ReadHeadersAsync(server).WaitAsync(TestHelper.PassingTestTimeout);
await server.WriteAsync(Encoding.ASCII.GetBytes(GetResponseHeaders()));

using HttpResponseMessage response = await clientTask.WaitAsync(TimeSpan.FromSeconds(10));
using HttpResponseMessage response = await clientTask.WaitAsync(TestHelper.PassingTestTimeout);
using Stream clientStream = response.Content.ReadAsStream();
Assert.False(sawZeroByteRead.Task.IsCompleted);

Task<int> zeroByteReadTask = Task.Run(() => StreamConformanceTests.ReadAsync(readMode, clientStream, Array.Empty<byte>(), 0, 0, CancellationToken.None));
Assert.False(zeroByteReadTask.IsCompleted);

// The zero-byte read should block until data is actually available
await sawZeroByteRead.Task.WaitAsync(TimeSpan.FromSeconds(10));
await sawZeroByteRead.Task.WaitAsync(TestHelper.PassingTestTimeout);
Assert.False(zeroByteReadTask.IsCompleted);

byte[] data = "Hello"u8.ToArray();
await WriteAsync(server, data);
await server.FlushAsync();

Assert.Equal(0, await zeroByteReadTask.WaitAsync(TimeSpan.FromSeconds(10)));
Assert.Equal(0, await zeroByteReadTask.WaitAsync(TestHelper.PassingTestTimeout));

// Now that data is available, a zero-byte read should complete synchronously
zeroByteReadTask = StreamConformanceTests.ReadAsync(readMode, clientStream, Array.Empty<byte>(), 0, 0, CancellationToken.None);
Expand All @@ -147,7 +147,7 @@ public async Task ZeroByteRead_IssuesZeroByteReadOnUnderlyingStream(StreamConfor
int read = 0;
while (read < data.Length)
{
read += await StreamConformanceTests.ReadAsync(readMode, clientStream, readBuffer, read, readBuffer.Length - read, CancellationToken.None).WaitAsync(TimeSpan.FromSeconds(10));
read += await StreamConformanceTests.ReadAsync(readMode, clientStream, readBuffer, read, readBuffer.Length - read, CancellationToken.None).WaitAsync(TestHelper.PassingTestTimeout);
}

Assert.Equal(data.Length, read);
Expand Down