Skip to content

Commit adb4656

Browse files
liveansliveans
committed
Revert "Disable parallel test execution for QUIC and HTTP/3 (dotnet#101569)"
This reverts commit 009d74e.
1 parent b35b727 commit adb4656

4 files changed

Lines changed: 3 additions & 22 deletions

File tree

‎src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Cookies.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private static CookieContainer CreateSingleCookieContainer(Uri uri, string cooki
4444
private static string GetCookieHeaderValue(string cookieName, string cookieValue) => $"{cookieName}={cookieValue}";
4545

4646
[Fact]
47-
public virtual async Task GetAsync_DefaultCoookieContainer_NoCookieSent()
47+
public async Task GetAsync_DefaultCoookieContainer_NoCookieSent()
4848
{
4949
await LoopbackServerFactory.CreateClientAndServerAsync(
5050
async uri =>

‎src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.AltSvc.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,10 @@ private HttpClient CreateHttpClient(Version version)
2929
return client;
3030
}
3131

32-
[ConditionalTheory]
32+
[Theory]
3333
[MemberData(nameof(AltSvcHeaderUpgradeVersions))]
3434
public async Task AltSvc_Header_Upgrade_Success(Version fromVersion, bool overrideHost)
3535
{
36-
if (UseVersion == HttpVersion30 && fromVersion == HttpVersion.Version11 && overrideHost)
37-
{
38-
throw new SkipTestException("https://github.com/dotnet/runtime/issues/91757");
39-
}
40-
4136
// The test makes a request to a HTTP/1 or HTTP/2 server first, which supplies an Alt-Svc header pointing to the second server.
4237
using GenericLoopbackServer firstServer =
4338
fromVersion.Major switch

‎src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1633,7 +1633,6 @@ public SocketsHttpHandler_HttpClientHandler_MaxResponseHeadersLength_Http2(ITest
16331633
protected override Version UseVersion => HttpVersion.Version20;
16341634
}
16351635

1636-
[Collection(nameof(DisableParallelization))]
16371636
[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
16381637
public sealed class SocketsHttpHandler_HttpClientHandler_MaxResponseHeadersLength_Http3 : SocketsHttpHandler_HttpClientHandler_MaxResponseHeadersLength
16391638
{
@@ -4026,51 +4025,41 @@ public SocketsHttpHandler_HttpClientHandler_Cancellation_Test_Http2(ITestOutputH
40264025
protected override Version UseVersion => HttpVersion.Version20;
40274026
}
40284027

4029-
[Collection(nameof(DisableParallelization))]
40304028
[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
40314029
public sealed class SocketsHttpHandlerTest_HttpClientHandlerTest_Http3 : HttpClientHandlerTest
40324030
{
40334031
public SocketsHttpHandlerTest_HttpClientHandlerTest_Http3(ITestOutputHelper output) : base(output) { }
40344032
protected override Version UseVersion => HttpVersion.Version30;
40354033
}
40364034

4037-
[Collection(nameof(DisableParallelization))]
40384035
[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
40394036
public sealed class SocketsHttpHandlerTest_Cookies_Http3 : HttpClientHandlerTest_Cookies
40404037
{
40414038
public SocketsHttpHandlerTest_Cookies_Http3(ITestOutputHelper output) : base(output) { }
40424039
protected override Version UseVersion => HttpVersion.Version30;
4043-
4044-
[Fact]
4045-
[ActiveIssue("https://github.com/dotnet/runtime/issues/91757")]
4046-
public override Task GetAsync_DefaultCoookieContainer_NoCookieSent() { return null!; }
40474040
}
40484041

4049-
[Collection(nameof(DisableParallelization))]
40504042
[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
40514043
public sealed class SocketsHttpHandlerTest_HttpClientHandlerTest_Headers_Http3 : HttpClientHandlerTest_Headers
40524044
{
40534045
public SocketsHttpHandlerTest_HttpClientHandlerTest_Headers_Http3(ITestOutputHelper output) : base(output) { }
40544046
protected override Version UseVersion => HttpVersion.Version30;
40554047
}
40564048

4057-
[Collection(nameof(DisableParallelization))]
40584049
[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
40594050
public sealed class SocketsHttpHandler_HttpClientHandler_Cancellation_Test_Http3 : SocketsHttpHandler_Cancellation_Test
40604051
{
40614052
public SocketsHttpHandler_HttpClientHandler_Cancellation_Test_Http3(ITestOutputHelper output) : base(output) { }
40624053
protected override Version UseVersion => HttpVersion.Version30;
40634054
}
40644055

4065-
[Collection(nameof(DisableParallelization))]
40664056
[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
40674057
public sealed class SocketsHttpHandler_HttpClientHandler_AltSvc_Test_Http3 : HttpClientHandler_AltSvc_Test
40684058
{
40694059
public SocketsHttpHandler_HttpClientHandler_AltSvc_Test_Http3(ITestOutputHelper output) : base(output) { }
40704060
protected override Version UseVersion => HttpVersion.Version30;
40714061
}
40724062

4073-
[Collection(nameof(DisableParallelization))]
40744063
[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
40754064
public sealed class SocketsHttpHandler_HttpClientHandler_Finalization_Http3 : HttpClientHandler_Finalization_Test
40764065
{
@@ -4235,7 +4224,6 @@ public SocketsHttpHandler_RequestContentLengthMismatchTest_Http2(ITestOutputHelp
42354224
protected override Version UseVersion => HttpVersion.Version20;
42364225
}
42374226

4238-
[Collection(nameof(DisableParallelization))]
42394227
[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
42404228
public sealed class SocketsHttpHandler_RequestContentLengthMismatchTest_Http3 : SocketsHttpHandler_RequestContentLengthMismatchTest
42414229
{
@@ -4412,7 +4400,6 @@ public SocketsHttpHandler_SocketsHttpHandler_SecurityTest_Http2(ITestOutputHelpe
44124400
protected override Version UseVersion => HttpVersion.Version20;
44134401
}
44144402

4415-
[Collection(nameof(DisableParallelization))]
44164403
[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
44174404
public sealed class SocketsHttpHandler_SocketsHttpHandler_SecurityTest_Http3 : SocketsHttpHandler_SecurityTest
44184405
{
@@ -4541,7 +4528,6 @@ await Http11LoopbackServerFactory.Singleton.CreateClientAndServerAsync(async uri
45414528
}
45424529
}
45434530

4544-
[Collection(nameof(DisableParallelization))]
45454531
[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
45464532
public sealed class SocketsHttpHandler_HttpRequestErrorTest_Http30 : SocketsHttpHandler_HttpRequestErrorTest
45474533
{

‎src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestCollection.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace System.Net.Quic.Tests;
1717

18-
[CollectionDefinition(nameof(QuicTestCollection), DisableParallelization = true)]
18+
[CollectionDefinition(nameof(QuicTestCollection))]
1919
public unsafe class QuicTestCollection : ICollectionFixture<QuicTestCollection>, IDisposable
2020
{
2121
public static bool IsSupported => QuicListener.IsSupported && QuicConnection.IsSupported;

0 commit comments

Comments
 (0)