Revert "[release/8.0] Disable tests targetting http://corefx-net-http11.azure…" (#114209)

rzikm · web-flow · commit d7a2497a106c · 2025-04-04T12:18:54.000+02:00
This reverts commit 7bdb3db.
diff --git a/src/libraries/Common/tests/System/Net/Configuration.Http.cs b/src/libraries/Common/tests/System/Net/Configuration.Http.cs
@@ -58,12 +58,7 @@ public static partial class Http
             public static readonly Uri RemoteEchoServer = new Uri("http://" + Host + "/" + EchoHandler);
             public static readonly Uri SecureRemoteEchoServer = new Uri("https://" + SecureHost + "/" + EchoHandler);
             public static readonly Uri Http2RemoteEchoServer = new Uri("https://" + Http2Host + "/" + EchoHandler);
-            public static Uri[] EchoServerList => [
-                // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                // RemoteEchoServer,
-                SecureRemoteEchoServer,
-                Http2RemoteEchoServer
-            ];
+            public static readonly Uri[] EchoServerList = new Uri[] { RemoteEchoServer, SecureRemoteEchoServer, Http2RemoteEchoServer };
 
             public static readonly Uri RemoteVerifyUploadServer = new Uri("http://" + Host + "/" + VerifyUploadHandler);
             public static readonly Uri SecureRemoteVerifyUploadServer = new Uri("https://" + SecureHost + "/" + VerifyUploadHandler);
@@ -78,20 +73,8 @@ public static partial class Http
             public static Uri RemoteLoopServer => new Uri("ws://" + RemoteLoopHost + "/" + RemoteLoopHandler);
 
             public static readonly object[][] EchoServers = EchoServerList.Select(x => new object[] { x }).ToArray();
-            public static readonly object[][] VerifyUploadServers = {
-                // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                // new object[] { RemoteVerifyUploadServer },
-                new object[] { SecureRemoteVerifyUploadServer },
-                new object[] { Http2RemoteVerifyUploadServer }
-            };
-
-            public static readonly object[][] CompressedServers = {
-                // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                // new object[] { RemoteDeflateServer },
-                new object[] { RemoteGZipServer },
-                new object[] { Http2RemoteDeflateServer },
-                new object[] { Http2RemoteGZipServer }
-            };
+            public static readonly object[][] VerifyUploadServers = { new object[] { RemoteVerifyUploadServer }, new object[] { SecureRemoteVerifyUploadServer }, new object[] { Http2RemoteVerifyUploadServer } };
+            public static readonly object[][] CompressedServers = { new object[] { RemoteDeflateServer }, new object[] { RemoteGZipServer }, new object[] { Http2RemoteDeflateServer }, new object[] { Http2RemoteGZipServer } };
 
             public static readonly object[][] Http2Servers = { new object[] { new Uri("https://" + Http2Host) } };
             public static readonly object[][] Http2NoPushServers = { new object[] { new Uri("https://" + Http2NoPushHost) } };
@@ -101,14 +84,7 @@ public static partial class Http
             public static readonly RemoteServer RemoteSecureHttp11Server = new RemoteServer(new Uri("https://" + SecureHost + "/"), HttpVersion.Version11);
             public static readonly RemoteServer RemoteHttp2Server = new RemoteServer(new Uri("https://" + Http2Host + "/"), new Version(2, 0));
 
-            public static IEnumerable<RemoteServer> RemoteServers =>
-                new RemoteServer[]
-                {
-                    // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                    // RemoteHttp11Server,
-                    RemoteSecureHttp11Server,
-                    RemoteHttp2Server
-                };
+            public static readonly IEnumerable<RemoteServer> RemoteServers = new RemoteServer[] { RemoteHttp11Server, RemoteSecureHttp11Server, RemoteHttp2Server };
 
             public static readonly IEnumerable<object[]> RemoteServersMemberData = RemoteServers.Select(s => new object[] { s });
 
diff --git a/src/libraries/Common/tests/System/Net/Configuration.WebSockets.cs b/src/libraries/Common/tests/System/Net/Configuration.WebSockets.cs
@@ -22,17 +22,8 @@ public static partial class WebSockets
             public static readonly Uri RemoteEchoHeadersServer = new Uri("ws://" + Host + "/" + EchoHeadersHandler);
             public static readonly Uri SecureRemoteEchoHeadersServer = new Uri("wss://" + SecureHost + "/" + EchoHeadersHandler);
 
-            public static object[][] EchoServers => new object[][] {
-                // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                // new object[] { RemoteEchoServer },
-                new object[] { SecureRemoteEchoServer },
-            };
-
-            public static object[][] EchoHeadersServers => new object[][] {
-                // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                // new object[] { RemoteEchoHeadersServer },
-                new object[] { SecureRemoteEchoHeadersServer },
-            };
+            public static readonly object[][] EchoServers = { new object[] { RemoteEchoServer }, new object[] { SecureRemoteEchoServer } };
+            public static readonly object[][] EchoHeadersServers = { new object[] { RemoteEchoHeadersServer }, new object[] { SecureRemoteEchoHeadersServer } };
         }
     }
 }
diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.RemoteServer.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.RemoteServer.cs
@@ -71,7 +71,7 @@ public async Task UseDefaultCredentials_SetToFalseAndServerNeedsAuth_StatusCodeU
             handler.UseDefaultCredentials = false;
             using (HttpClient client = CreateHttpClient(handler))
             {
-                Uri uri = Configuration.Http.RemoteSecureHttp11Server.NegotiateAuthUriForDefaultCreds;
+                Uri uri = Configuration.Http.RemoteHttp11Server.NegotiateAuthUriForDefaultCreds;
                 _output.WriteLine("Uri: {0}", uri);
                 using (HttpResponseMessage response = await client.GetAsync(uri))
                 {
@@ -601,9 +601,9 @@ public async Task PostAsync_CallMethod_EmptyContent(Configuration.Http.RemoteSer
         public static IEnumerable<object[]> ExpectContinueVersion()
         {
             return
-                from expect in new bool?[] { true, false, null }
-                from version in new Version[] { new Version(1, 0), new Version(1, 1), new Version(2, 0) }
-                select new object[] { expect, version };
+                from expect in new bool?[] {true, false, null}
+                from version in new Version[] {new Version(1, 0), new Version(1, 1), new Version(2, 0)}
+                select new object[] {expect, version};
         }
 
         [OuterLoop("Uses external servers", typeof(PlatformDetection), nameof(PlatformDetection.LocalEchoServerIsNotAvailable))]
@@ -781,8 +781,7 @@ public async Task SendAsync_SendRequestUsingMethodToEchoServerWithNoContent_Meth
             {
                 var request = new HttpRequestMessage(
                     new HttpMethod(method),
-                    serverUri)
-                { Version = UseVersion };
+                    serverUri) { Version = UseVersion };
 
                 using (HttpResponseMessage response = await client.SendAsync(TestAsync, request))
                 {
@@ -808,8 +807,7 @@ public async Task SendAsync_SendRequestUsingMethodToEchoServerWithContent_Succes
             {
                 var request = new HttpRequestMessage(
                     new HttpMethod(method),
-                    serverUri)
-                { Version = UseVersion };
+                    serverUri) { Version = UseVersion };
                 request.Content = new StringContent(ExpectedContent);
                 using (HttpResponseMessage response = await client.SendAsync(TestAsync, request))
                 {
@@ -988,7 +986,6 @@ public async Task GetAsync_AllowAutoRedirectTrue_RedirectFromHttpToHttp_StatusCo
         [OuterLoop("Uses external servers")]
         [Fact]
         [ActiveIssue("https://github.com/dotnet/runtime/issues/55083", TestPlatforms.Browser)]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/110578")]
         public async Task GetAsync_AllowAutoRedirectTrue_RedirectFromHttpToHttps_StatusCodeOK()
         {
             HttpClientHandler handler = CreateHttpClientHandler();
@@ -1073,17 +1070,17 @@ public async Task GetAsync_MaxAutomaticRedirectionsNServerHops_ThrowsIfTooMany(i
             handler.MaxAutomaticRedirections = maxHops;
             using (HttpClient client = CreateHttpClient(handler))
             {
-                Task<HttpResponseMessage> t = client.GetAsync(Configuration.Http.RemoteSecureHttp11Server.RedirectUriForDestinationUri(
+                Task<HttpResponseMessage> t = client.GetAsync(Configuration.Http.RemoteHttp11Server.RedirectUriForDestinationUri(
                     statusCode: 302,
-                    destinationUri: Configuration.Http.RemoteSecureHttp11Server.EchoUri,
+                    destinationUri: Configuration.Http.RemoteHttp11Server.EchoUri,
                     hops: hops));
 
                 if (hops <= maxHops)
                 {
                     using (HttpResponseMessage response = await t)
                     {
                         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-                        Assert.Equal(Configuration.Http.SecureRemoteEchoServer, response.RequestMessage.RequestUri);
+                        Assert.Equal(Configuration.Http.RemoteEchoServer, response.RequestMessage.RequestUri);
                     }
                 }
                 else
diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ServerCertificates.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ServerCertificates.cs
@@ -97,7 +97,6 @@ public async Task NoCallback_ValidCertificate_SuccessAndExpectedPropertyBehavior
 
         [OuterLoop("Uses external servers")]
         [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/110578")]
         public async Task UseCallback_NotSecureConnection_CallbackNotCalled()
         {
             HttpClientHandler handler = CreateHttpClientHandler();
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/ServerCertificateTest.cs b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/ServerCertificateTest.cs
@@ -32,7 +32,6 @@ public async Task NoCallback_ValidCertificate_CallbackNotCalled()
 
         [OuterLoop]
         [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/110578")]
         public async Task UseCallback_NotSecureConnection_CallbackNotCalled()
         {
             var handler = new WinHttpHandler();
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/WinHttpHandlerTest.cs b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/WinHttpHandlerTest.cs
@@ -55,7 +55,7 @@ public async Task GetAsync_RedirectResponseHasCookie_CookieSentToFinalUri(
             string cookieName,
             string cookieValue)
         {
-            Uri uri = System.Net.Test.Common.Configuration.Http.RemoteSecureHttp11Server.RedirectUriForDestinationUri(302, System.Net.Test.Common.Configuration.Http.SecureRemoteEchoServer, 1);
+            Uri uri = System.Net.Test.Common.Configuration.Http.RemoteHttp11Server.RedirectUriForDestinationUri(302, System.Net.Test.Common.Configuration.Http.RemoteEchoServer, 1);
             var handler = new WinHttpHandler();
             handler.WindowsProxyUsePolicy = WindowsProxyUsePolicy.UseWinInetProxy;
             handler.CookieUsePolicy = cookieUsePolicy;
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs
@@ -1112,7 +1112,7 @@ public Task RequestDuration_Redirect_RecordedForEachHttpSpan()
                     });
 
                 }, options: new GenericLoopbackOptions() { UseSsl = true });
-            }, options: new GenericLoopbackOptions() { UseSsl = false });
+            }, options: new GenericLoopbackOptions() { UseSsl = false});
         }
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -22,17 +22,8 @@ public static partial class WebSockets`
`22`	`22`	`public static readonly Uri RemoteEchoHeadersServer = new Uri("ws://" + Host + "/" + EchoHeadersHandler);`
`23`	`23`	`public static readonly Uri SecureRemoteEchoHeadersServer = new Uri("wss://" + SecureHost + "/" + EchoHeadersHandler);`
`24`	`24`
`25`		`- public static object[][] EchoServers => new object[][] {`
`26`		`- // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]`
`27`		`- // new object[] { RemoteEchoServer },`
`28`		`- new object[] { SecureRemoteEchoServer },`
`29`		`- };`
`30`		`-`
`31`		`- public static object[][] EchoHeadersServers => new object[][] {`
`32`		`- // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]`
`33`		`- // new object[] { RemoteEchoHeadersServer },`
`34`		`- new object[] { SecureRemoteEchoHeadersServer },`
`35`		`- };`
	`25`	`+ public static readonly object[][] EchoServers = { new object[] { RemoteEchoServer }, new object[] { SecureRemoteEchoServer } };`
	`26`	`+ public static readonly object[][] EchoHeadersServers = { new object[] { RemoteEchoHeadersServer }, new object[] { SecureRemoteEchoHeadersServer } };`
`36`	`27`	`}`
`37`	`28`	`}`
`38`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public async Task UseDefaultCredentials_SetToFalseAndServerNeedsAuth_StatusCodeU`
`71`	`71`	`handler.UseDefaultCredentials = false;`
`72`	`72`	`using (HttpClient client = CreateHttpClient(handler))`
`73`	`73`	`{`
`74`		`- Uri uri = Configuration.Http.RemoteSecureHttp11Server.NegotiateAuthUriForDefaultCreds;`
	`74`	`+ Uri uri = Configuration.Http.RemoteHttp11Server.NegotiateAuthUriForDefaultCreds;`
`75`	`75`	`_output.WriteLine("Uri: {0}", uri);`
`76`	`76`	`using (HttpResponseMessage response = await client.GetAsync(uri))`
`77`	`77`	`{`
`@@ -601,9 +601,9 @@ public async Task PostAsync_CallMethod_EmptyContent(Configuration.Http.RemoteSer`
`601`	`601`	`public static IEnumerable<object[]> ExpectContinueVersion()`
`602`	`602`	`{`
`603`	`603`	`return`
`604`		`- from expect in new bool?[] { true, false, null }`
`605`		`- from version in new Version[] { new Version(1, 0), new Version(1, 1), new Version(2, 0) }`
`606`		`- select new object[] { expect, version };`
	`604`	`+ from expect in new bool?[] {true, false, null}`
	`605`	`+ from version in new Version[] {new Version(1, 0), new Version(1, 1), new Version(2, 0)}`
	`606`	`+ select new object[] {expect, version};`
`607`	`607`	`}`
`608`	`608`
`609`	`609`	`[OuterLoop("Uses external servers", typeof(PlatformDetection), nameof(PlatformDetection.LocalEchoServerIsNotAvailable))]`
`@@ -781,8 +781,7 @@ public async Task SendAsync_SendRequestUsingMethodToEchoServerWithNoContent_Meth`
`781`	`781`	`{`
`782`	`782`	`var request = new HttpRequestMessage(`
`783`	`783`	`new HttpMethod(method),`
`784`		`- serverUri)`
`785`		`- { Version = UseVersion };`
	`784`	`+ serverUri) { Version = UseVersion };`
`786`	`785`
`787`	`786`	`using (HttpResponseMessage response = await client.SendAsync(TestAsync, request))`
`788`	`787`	`{`
`@@ -808,8 +807,7 @@ public async Task SendAsync_SendRequestUsingMethodToEchoServerWithContent_Succes`
`808`	`807`	`{`
`809`	`808`	`var request = new HttpRequestMessage(`
`810`	`809`	`new HttpMethod(method),`
`811`		`- serverUri)`
`812`		`- { Version = UseVersion };`
	`810`	`+ serverUri) { Version = UseVersion };`
`813`	`811`	`request.Content = new StringContent(ExpectedContent);`
`814`	`812`	`using (HttpResponseMessage response = await client.SendAsync(TestAsync, request))`
`815`	`813`	`{`
`@@ -988,7 +986,6 @@ public async Task GetAsync_AllowAutoRedirectTrue_RedirectFromHttpToHttp_StatusCo`
`988`	`986`	`[OuterLoop("Uses external servers")]`
`989`	`987`	`[Fact]`
`990`	`988`	`[ActiveIssue("https://github.com/dotnet/runtime/issues/55083", TestPlatforms.Browser)]`
`991`		`- [ActiveIssue("https://github.com/dotnet/runtime/issues/110578")]`
`992`	`989`	`public async Task GetAsync_AllowAutoRedirectTrue_RedirectFromHttpToHttps_StatusCodeOK()`
`993`	`990`	`{`
`994`	`991`	`HttpClientHandler handler = CreateHttpClientHandler();`
`@@ -1073,17 +1070,17 @@ public async Task GetAsync_MaxAutomaticRedirectionsNServerHops_ThrowsIfTooMany(i`
`1073`	`1070`	`handler.MaxAutomaticRedirections = maxHops;`
`1074`	`1071`	`using (HttpClient client = CreateHttpClient(handler))`
`1075`	`1072`	`{`
`1076`		`- Task<HttpResponseMessage> t = client.GetAsync(Configuration.Http.RemoteSecureHttp11Server.RedirectUriForDestinationUri(`
	`1073`	`+ Task<HttpResponseMessage> t = client.GetAsync(Configuration.Http.RemoteHttp11Server.RedirectUriForDestinationUri(`
`1077`	`1074`	`statusCode: 302,`
`1078`		`- destinationUri: Configuration.Http.RemoteSecureHttp11Server.EchoUri,`
	`1075`	`+ destinationUri: Configuration.Http.RemoteHttp11Server.EchoUri,`
`1079`	`1076`	`hops: hops));`
`1080`	`1077`
`1081`	`1078`	`if (hops <= maxHops)`
`1082`	`1079`	`{`
`1083`	`1080`	`using (HttpResponseMessage response = await t)`
`1084`	`1081`	`{`
`1085`	`1082`	`Assert.Equal(HttpStatusCode.OK, response.StatusCode);`
`1086`		`- Assert.Equal(Configuration.Http.SecureRemoteEchoServer, response.RequestMessage.RequestUri);`
	`1083`	`+ Assert.Equal(Configuration.Http.RemoteEchoServer, response.RequestMessage.RequestUri);`
`1087`	`1084`	`}`
`1088`	`1085`	`}`
`1089`	`1086`	`else`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,6 @@ public async Task NoCallback_ValidCertificate_SuccessAndExpectedPropertyBehavior`
`97`	`97`
`98`	`98`	`[OuterLoop("Uses external servers")]`
`99`	`99`	`[Fact]`
`100`		`- [ActiveIssue("https://github.com/dotnet/runtime/issues/110578")]`
`101`	`100`	`public async Task UseCallback_NotSecureConnection_CallbackNotCalled()`
`102`	`101`	`{`
`103`	`102`	`HttpClientHandler handler = CreateHttpClientHandler();`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ public async Task NoCallback_ValidCertificate_CallbackNotCalled()`
`32`	`32`
`33`	`33`	`[OuterLoop]`
`34`	`34`	`[Fact]`
`35`		`- [ActiveIssue("https://github.com/dotnet/runtime/issues/110578")]`
`36`	`35`	`public async Task UseCallback_NotSecureConnection_CallbackNotCalled()`
`37`	`36`	`{`
`38`	`37`	`var handler = new WinHttpHandler();`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public async Task GetAsync_RedirectResponseHasCookie_CookieSentToFinalUri(`
`55`	`55`	`string cookieName,`
`56`	`56`	`string cookieValue)`
`57`	`57`	`{`
`58`		`- Uri uri = System.Net.Test.Common.Configuration.Http.RemoteSecureHttp11Server.RedirectUriForDestinationUri(302, System.Net.Test.Common.Configuration.Http.SecureRemoteEchoServer, 1);`
	`58`	`+ Uri uri = System.Net.Test.Common.Configuration.Http.RemoteHttp11Server.RedirectUriForDestinationUri(302, System.Net.Test.Common.Configuration.Http.RemoteEchoServer, 1);`
`59`	`59`	`var handler = new WinHttpHandler();`
`60`	`60`	`handler.WindowsProxyUsePolicy = WindowsProxyUsePolicy.UseWinInetProxy;`
`61`	`61`	`handler.CookieUsePolicy = cookieUsePolicy;`
Original file line number	Diff line number	Diff line change
`@@ -1112,7 +1112,7 @@ public Task RequestDuration_Redirect_RecordedForEachHttpSpan()`
`1112`	`1112`	`});`
`1113`	`1113`
`1114`	`1114`	`}, options: new GenericLoopbackOptions() { UseSsl = true });`
`1115`		`- }, options: new GenericLoopbackOptions() { UseSsl = false });`
	`1115`	`+ }, options: new GenericLoopbackOptions() { UseSsl = false});`
`1116`	`1116`	`}`
`1117`	`1117`
`1118`	`1118`	`[Fact]`