From 148dd2f782806a9c8a4aecf214ea0fd36f14eb9d Mon Sep 17 00:00:00 2001 From: wfurt Date: Mon, 1 Aug 2022 16:34:14 -0700 Subject: [PATCH 1/3] increase timeout on ZeroByteRead_IssuesZeroByteReadOnUnderlyingStream test' --- .../FunctionalTests/ResponseStreamZeroByteReadTests.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs index 3b8bfd0d75a1b5..97ecb12a22108c 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs @@ -114,14 +114,14 @@ public async Task ZeroByteRead_IssuesZeroByteReadOnUnderlyingStream(StreamConfor cert, clientCertificateRequired: true, enabledSslProtocols: SslProtocols.Tls12, - checkCertificateRevocation: false).WaitAsync(TimeSpan.FromSeconds(10)); + checkCertificateRevocation: false).WaitAsync(TimeSpan.FromSeconds(30)); } } - await ResponseConnectedStreamConformanceTests.ReadHeadersAsync(server).WaitAsync(TimeSpan.FromSeconds(10)); + await ResponseConnectedStreamConformanceTests.ReadHeadersAsync(server).WaitAsync(TimeSpan.FromSeconds(30)); await server.WriteAsync(Encoding.ASCII.GetBytes(GetResponseHeaders())); - using HttpResponseMessage response = await clientTask.WaitAsync(TimeSpan.FromSeconds(10)); + using HttpResponseMessage response = await clientTask.WaitAsync(TimeSpan.FromSeconds(30)); using Stream clientStream = response.Content.ReadAsStream(); Assert.False(sawZeroByteRead.Task.IsCompleted); @@ -129,14 +129,14 @@ public async Task ZeroByteRead_IssuesZeroByteReadOnUnderlyingStream(StreamConfor 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(TimeSpan.FromSeconds(30)); 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(TimeSpan.FromSeconds(30))); // Now that data is available, a zero-byte read should complete synchronously zeroByteReadTask = StreamConformanceTests.ReadAsync(readMode, clientStream, Array.Empty(), 0, 0, CancellationToken.None); From ab25dc2c507a70ce683f8cf5d1f78d524bfd6e04 Mon Sep 17 00:00:00 2001 From: wfurt Date: Mon, 1 Aug 2022 21:20:06 -0700 Subject: [PATCH 2/3] feedback from review --- .../ResponseStreamZeroByteReadTests.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs index 97ecb12a22108c..254c9d0a025a18 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs @@ -114,14 +114,14 @@ public async Task ZeroByteRead_IssuesZeroByteReadOnUnderlyingStream(StreamConfor cert, clientCertificateRequired: true, enabledSslProtocols: SslProtocols.Tls12, - checkCertificateRevocation: false).WaitAsync(TimeSpan.FromSeconds(30)); + checkCertificateRevocation: false).WaitAsync(TimeSpan.FromSeconds(TestHelper.PassingTestTimeoutMilliseconds)); } } - await ResponseConnectedStreamConformanceTests.ReadHeadersAsync(server).WaitAsync(TimeSpan.FromSeconds(30)); + await ResponseConnectedStreamConformanceTests.ReadHeadersAsync(server).WaitAsync(TimeSpan.FromSeconds(TestHelper.PassingTestTimeoutMilliseconds)); await server.WriteAsync(Encoding.ASCII.GetBytes(GetResponseHeaders())); - using HttpResponseMessage response = await clientTask.WaitAsync(TimeSpan.FromSeconds(30)); + using HttpResponseMessage response = await clientTask.WaitAsync(TimeSpan.FromSeconds(TestHelper.PassingTestTimeoutMilliseconds)); using Stream clientStream = response.Content.ReadAsStream(); Assert.False(sawZeroByteRead.Task.IsCompleted); @@ -129,14 +129,14 @@ public async Task ZeroByteRead_IssuesZeroByteReadOnUnderlyingStream(StreamConfor Assert.False(zeroByteReadTask.IsCompleted); // The zero-byte read should block until data is actually available - await sawZeroByteRead.Task.WaitAsync(TimeSpan.FromSeconds(30)); + await sawZeroByteRead.Task.WaitAsync(TimeSpan.FromSeconds(TestHelper.PassingTestTimeoutMilliseconds)); Assert.False(zeroByteReadTask.IsCompleted); byte[] data = "Hello"u8.ToArray(); await WriteAsync(server, data); await server.FlushAsync(); - Assert.Equal(0, await zeroByteReadTask.WaitAsync(TimeSpan.FromSeconds(30))); + Assert.Equal(0, await zeroByteReadTask.WaitAsync(TimeSpan.FromSeconds(TestHelper.PassingTestTimeoutMilliseconds))); // Now that data is available, a zero-byte read should complete synchronously zeroByteReadTask = StreamConformanceTests.ReadAsync(readMode, clientStream, Array.Empty(), 0, 0, CancellationToken.None); @@ -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(TimeSpan.FromSeconds(TestHelper.PassingTestTimeoutMilliseconds)); } Assert.Equal(data.Length, read); From 21cbbd525ab80532624e7ccb3afc38b052ecd23c Mon Sep 17 00:00:00 2001 From: wfurt Date: Tue, 2 Aug 2022 10:57:57 -0700 Subject: [PATCH 3/3] feedback from review --- .../ResponseStreamZeroByteReadTests.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs index 254c9d0a025a18..6aa4fee4f2f30c 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/ResponseStreamZeroByteReadTests.cs @@ -114,14 +114,14 @@ public async Task ZeroByteRead_IssuesZeroByteReadOnUnderlyingStream(StreamConfor cert, clientCertificateRequired: true, enabledSslProtocols: SslProtocols.Tls12, - checkCertificateRevocation: false).WaitAsync(TimeSpan.FromSeconds(TestHelper.PassingTestTimeoutMilliseconds)); + checkCertificateRevocation: false).WaitAsync(TestHelper.PassingTestTimeout); } } - await ResponseConnectedStreamConformanceTests.ReadHeadersAsync(server).WaitAsync(TimeSpan.FromSeconds(TestHelper.PassingTestTimeoutMilliseconds)); + await ResponseConnectedStreamConformanceTests.ReadHeadersAsync(server).WaitAsync(TestHelper.PassingTestTimeout); await server.WriteAsync(Encoding.ASCII.GetBytes(GetResponseHeaders())); - using HttpResponseMessage response = await clientTask.WaitAsync(TimeSpan.FromSeconds(TestHelper.PassingTestTimeoutMilliseconds)); + using HttpResponseMessage response = await clientTask.WaitAsync(TestHelper.PassingTestTimeout); using Stream clientStream = response.Content.ReadAsStream(); Assert.False(sawZeroByteRead.Task.IsCompleted); @@ -129,14 +129,14 @@ public async Task ZeroByteRead_IssuesZeroByteReadOnUnderlyingStream(StreamConfor Assert.False(zeroByteReadTask.IsCompleted); // The zero-byte read should block until data is actually available - await sawZeroByteRead.Task.WaitAsync(TimeSpan.FromSeconds(TestHelper.PassingTestTimeoutMilliseconds)); + 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(TestHelper.PassingTestTimeoutMilliseconds))); + 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(), 0, 0, CancellationToken.None); @@ -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(TestHelper.PassingTestTimeoutMilliseconds)); + read += await StreamConformanceTests.ReadAsync(readMode, clientStream, readBuffer, read, readBuffer.Length - read, CancellationToken.None).WaitAsync(TestHelper.PassingTestTimeout); } Assert.Equal(data.Length, read);