Revert "Disable parallel test execution for QUIC and HTTP/3 (dotnet#101569)"

CarnaViire · CarnaViire · commit 3e1ee3f7e839 · 2024-05-28T14:25:42.000+01:00
This reverts commit 009d74e.
diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Cookies.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Cookies.cs
@@ -44,7 +44,7 @@ private static CookieContainer CreateSingleCookieContainer(Uri uri, string cooki
         private static string GetCookieHeaderValue(string cookieName, string cookieValue) => $"{cookieName}={cookieValue}";
 
         [Fact]
-        public virtual async Task GetAsync_DefaultCoookieContainer_NoCookieSent()
+        public async Task GetAsync_DefaultCoookieContainer_NoCookieSent()
         {
             await LoopbackServerFactory.CreateClientAndServerAsync(
                 async uri =>
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.AltSvc.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.AltSvc.cs
@@ -29,15 +29,10 @@ private HttpClient CreateHttpClient(Version version)
             return client;
         }
 
-        [ConditionalTheory]
+        [Theory]
         [MemberData(nameof(AltSvcHeaderUpgradeVersions))]
         public async Task AltSvc_Header_Upgrade_Success(Version fromVersion, bool overrideHost)
         {
-            if (UseVersion == HttpVersion30 && fromVersion == HttpVersion.Version11 && overrideHost)
-            {
-                throw new SkipTestException("https://github.com/dotnet/runtime/issues/91757");
-            }
-
             // 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.
             using GenericLoopbackServer firstServer =
                 fromVersion.Major switch
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs
@@ -1633,7 +1633,6 @@ public SocketsHttpHandler_HttpClientHandler_MaxResponseHeadersLength_Http2(ITest
         protected override Version UseVersion => HttpVersion.Version20;
     }
 
-    [Collection(nameof(DisableParallelization))]
     [ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
     [ActiveIssue("https://github.com/dotnet/runtime/issues/91757")]
     [ActiveIssue("https://github.com/dotnet/runtime/issues/101015")]
@@ -4028,51 +4027,41 @@ public SocketsHttpHandler_HttpClientHandler_Cancellation_Test_Http2(ITestOutputH
         protected override Version UseVersion => HttpVersion.Version20;
     }
 
-    [Collection(nameof(DisableParallelization))]
     [ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
     public sealed class SocketsHttpHandlerTest_HttpClientHandlerTest_Http3 : HttpClientHandlerTest
     {
         public SocketsHttpHandlerTest_HttpClientHandlerTest_Http3(ITestOutputHelper output) : base(output) { }
         protected override Version UseVersion => HttpVersion.Version30;
     }
 
-    [Collection(nameof(DisableParallelization))]
     [ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
     public sealed class SocketsHttpHandlerTest_Cookies_Http3 : HttpClientHandlerTest_Cookies
     {
         public SocketsHttpHandlerTest_Cookies_Http3(ITestOutputHelper output) : base(output) { }
         protected override Version UseVersion => HttpVersion.Version30;
-
-        [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/91757")]
-        public override Task GetAsync_DefaultCoookieContainer_NoCookieSent() { return null!; }
     }
 
-    [Collection(nameof(DisableParallelization))]
     [ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
     public sealed class SocketsHttpHandlerTest_HttpClientHandlerTest_Headers_Http3 : HttpClientHandlerTest_Headers
     {
         public SocketsHttpHandlerTest_HttpClientHandlerTest_Headers_Http3(ITestOutputHelper output) : base(output) { }
         protected override Version UseVersion => HttpVersion.Version30;
     }
 
-    [Collection(nameof(DisableParallelization))]
     [ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
     public sealed class SocketsHttpHandler_HttpClientHandler_Cancellation_Test_Http3 : SocketsHttpHandler_Cancellation_Test
     {
         public SocketsHttpHandler_HttpClientHandler_Cancellation_Test_Http3(ITestOutputHelper output) : base(output) { }
         protected override Version UseVersion => HttpVersion.Version30;
     }
 
-    [Collection(nameof(DisableParallelization))]
     [ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
     public sealed class SocketsHttpHandler_HttpClientHandler_AltSvc_Test_Http3 : HttpClientHandler_AltSvc_Test
     {
         public SocketsHttpHandler_HttpClientHandler_AltSvc_Test_Http3(ITestOutputHelper output) : base(output) { }
         protected override Version UseVersion => HttpVersion.Version30;
     }
 
-    [Collection(nameof(DisableParallelization))]
     [ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
     public sealed class SocketsHttpHandler_HttpClientHandler_Finalization_Http3 : HttpClientHandler_Finalization_Test
     {
@@ -4237,7 +4226,6 @@ public SocketsHttpHandler_RequestContentLengthMismatchTest_Http2(ITestOutputHelp
         protected override Version UseVersion => HttpVersion.Version20;
     }
 
-    [Collection(nameof(DisableParallelization))]
     [ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
     public sealed class SocketsHttpHandler_RequestContentLengthMismatchTest_Http3 : SocketsHttpHandler_RequestContentLengthMismatchTest
     {
@@ -4414,7 +4402,6 @@ public SocketsHttpHandler_SocketsHttpHandler_SecurityTest_Http2(ITestOutputHelpe
         protected override Version UseVersion => HttpVersion.Version20;
     }
 
-    [Collection(nameof(DisableParallelization))]
     [ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
     public sealed class SocketsHttpHandler_SocketsHttpHandler_SecurityTest_Http3 : SocketsHttpHandler_SecurityTest
     {
@@ -4543,7 +4530,6 @@ await Http11LoopbackServerFactory.Singleton.CreateClientAndServerAsync(async uri
         }
     }
 
-    [Collection(nameof(DisableParallelization))]
     [ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]
     public sealed class SocketsHttpHandler_HttpRequestErrorTest_Http30 : SocketsHttpHandler_HttpRequestErrorTest
     {
diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestCollection.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestCollection.cs
@@ -15,7 +15,7 @@
 
 namespace System.Net.Quic.Tests;
 
-[CollectionDefinition(nameof(QuicTestCollection), DisableParallelization = true)]
+[CollectionDefinition(nameof(QuicTestCollection))]
 public unsafe class QuicTestCollection : ICollectionFixture<QuicTestCollection>, IDisposable
 {
     public static bool IsSupported => QuicListener.IsSupported && QuicConnection.IsSupported;

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ private static CookieContainer CreateSingleCookieContainer(Uri uri, string cooki`
`44`	`44`	`private static string GetCookieHeaderValue(string cookieName, string cookieValue) => $"{cookieName}={cookieValue}";`
`45`	`45`
`46`	`46`	`[Fact]`
`47`		`- public virtual async Task GetAsync_DefaultCoookieContainer_NoCookieSent()`
	`47`	`+ public async Task GetAsync_DefaultCoookieContainer_NoCookieSent()`
`48`	`48`	`{`
`49`	`49`	`await LoopbackServerFactory.CreateClientAndServerAsync(`
`50`	`50`	`async uri =>`
Original file line number	Diff line number	Diff line change
`@@ -1633,7 +1633,6 @@ public SocketsHttpHandler_HttpClientHandler_MaxResponseHeadersLength_Http2(ITest`
`1633`	`1633`	`protected override Version UseVersion => HttpVersion.Version20;`
`1634`	`1634`	`}`
`1635`	`1635`
`1636`		`- [Collection(nameof(DisableParallelization))]`
`1637`	`1636`	`[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]`
`1638`	`1637`	`[ActiveIssue("https://github.com/dotnet/runtime/issues/91757")]`
`1639`	`1638`	`[ActiveIssue("https://github.com/dotnet/runtime/issues/101015")]`
`@@ -4028,51 +4027,41 @@ public SocketsHttpHandler_HttpClientHandler_Cancellation_Test_Http2(ITestOutputH`
`4028`	`4027`	`protected override Version UseVersion => HttpVersion.Version20;`
`4029`	`4028`	`}`
`4030`	`4029`
`4031`		`- [Collection(nameof(DisableParallelization))]`
`4032`	`4030`	`[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]`
`4033`	`4031`	`public sealed class SocketsHttpHandlerTest_HttpClientHandlerTest_Http3 : HttpClientHandlerTest`
`4034`	`4032`	`{`
`4035`	`4033`	`public SocketsHttpHandlerTest_HttpClientHandlerTest_Http3(ITestOutputHelper output) : base(output) { }`
`4036`	`4034`	`protected override Version UseVersion => HttpVersion.Version30;`
`4037`	`4035`	`}`
`4038`	`4036`
`4039`		`- [Collection(nameof(DisableParallelization))]`
`4040`	`4037`	`[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]`
`4041`	`4038`	`public sealed class SocketsHttpHandlerTest_Cookies_Http3 : HttpClientHandlerTest_Cookies`
`4042`	`4039`	`{`
`4043`	`4040`	`public SocketsHttpHandlerTest_Cookies_Http3(ITestOutputHelper output) : base(output) { }`
`4044`	`4041`	`protected override Version UseVersion => HttpVersion.Version30;`
`4045`		`-`
`4046`		`- [Fact]`
`4047`		`- [ActiveIssue("https://github.com/dotnet/runtime/issues/91757")]`
`4048`		`- public override Task GetAsync_DefaultCoookieContainer_NoCookieSent() { return null!; }`
`4049`	`4042`	`}`
`4050`	`4043`
`4051`		`- [Collection(nameof(DisableParallelization))]`
`4052`	`4044`	`[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]`
`4053`	`4045`	`public sealed class SocketsHttpHandlerTest_HttpClientHandlerTest_Headers_Http3 : HttpClientHandlerTest_Headers`
`4054`	`4046`	`{`
`4055`	`4047`	`public SocketsHttpHandlerTest_HttpClientHandlerTest_Headers_Http3(ITestOutputHelper output) : base(output) { }`
`4056`	`4048`	`protected override Version UseVersion => HttpVersion.Version30;`
`4057`	`4049`	`}`
`4058`	`4050`
`4059`		`- [Collection(nameof(DisableParallelization))]`
`4060`	`4051`	`[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]`
`4061`	`4052`	`public sealed class SocketsHttpHandler_HttpClientHandler_Cancellation_Test_Http3 : SocketsHttpHandler_Cancellation_Test`
`4062`	`4053`	`{`
`4063`	`4054`	`public SocketsHttpHandler_HttpClientHandler_Cancellation_Test_Http3(ITestOutputHelper output) : base(output) { }`
`4064`	`4055`	`protected override Version UseVersion => HttpVersion.Version30;`
`4065`	`4056`	`}`
`4066`	`4057`
`4067`		`- [Collection(nameof(DisableParallelization))]`
`4068`	`4058`	`[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]`
`4069`	`4059`	`public sealed class SocketsHttpHandler_HttpClientHandler_AltSvc_Test_Http3 : HttpClientHandler_AltSvc_Test`
`4070`	`4060`	`{`
`4071`	`4061`	`public SocketsHttpHandler_HttpClientHandler_AltSvc_Test_Http3(ITestOutputHelper output) : base(output) { }`
`4072`	`4062`	`protected override Version UseVersion => HttpVersion.Version30;`
`4073`	`4063`	`}`
`4074`	`4064`
`4075`		`- [Collection(nameof(DisableParallelization))]`
`4076`	`4065`	`[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]`
`4077`	`4066`	`public sealed class SocketsHttpHandler_HttpClientHandler_Finalization_Http3 : HttpClientHandler_Finalization_Test`
`4078`	`4067`	`{`
`@@ -4237,7 +4226,6 @@ public SocketsHttpHandler_RequestContentLengthMismatchTest_Http2(ITestOutputHelp`
`4237`	`4226`	`protected override Version UseVersion => HttpVersion.Version20;`
`4238`	`4227`	`}`
`4239`	`4228`
`4240`		`- [Collection(nameof(DisableParallelization))]`
`4241`	`4229`	`[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]`
`4242`	`4230`	`public sealed class SocketsHttpHandler_RequestContentLengthMismatchTest_Http3 : SocketsHttpHandler_RequestContentLengthMismatchTest`
`4243`	`4231`	`{`
`@@ -4414,7 +4402,6 @@ public SocketsHttpHandler_SocketsHttpHandler_SecurityTest_Http2(ITestOutputHelpe`
`4414`	`4402`	`protected override Version UseVersion => HttpVersion.Version20;`
`4415`	`4403`	`}`
`4416`	`4404`
`4417`		`- [Collection(nameof(DisableParallelization))]`
`4418`	`4405`	`[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]`
`4419`	`4406`	`public sealed class SocketsHttpHandler_SocketsHttpHandler_SecurityTest_Http3 : SocketsHttpHandler_SecurityTest`
`4420`	`4407`	`{`
`@@ -4543,7 +4530,6 @@ await Http11LoopbackServerFactory.Singleton.CreateClientAndServerAsync(async uri`
`4543`	`4530`	`}`
`4544`	`4531`	`}`
`4545`	`4532`
`4546`		`- [Collection(nameof(DisableParallelization))]`
`4547`	`4533`	`[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))]`
`4548`	`4534`	`public sealed class SocketsHttpHandler_HttpRequestErrorTest_Http30 : SocketsHttpHandler_HttpRequestErrorTest`
`4549`	`4535`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`namespace System.Net.Quic.Tests;`
`17`	`17`
`18`		`-[CollectionDefinition(nameof(QuicTestCollection), DisableParallelization = true)]`
	`18`	`+[CollectionDefinition(nameof(QuicTestCollection))]`
`19`	`19`	`public unsafe class QuicTestCollection : ICollectionFixture<QuicTestCollection>, IDisposable`
`20`	`20`	`{`
`21`	`21`	`public static bool IsSupported => QuicListener.IsSupported && QuicConnection.IsSupported;`