[release/9.0-staging] Revert disabling of tests for HTTP servers (#114207)

github-actions[bot] · rzikm · web-flow · commit 5c4ffe388c54 · 2025-04-04T12:18:58.000+02:00
* Revert "Disable tests using http://corefx-net-http11.azurewebsites.net (#111235)" This reverts commit de8e135. * Revert "Disable more tests dependent on http://corefx-net-http11.azurewebsites.net (#111354)" This reverts commit 9fea441. --------- Co-authored-by: Radek Zikmund <r.zikmund.rz@gmail.com>
diff --git a/src/libraries/Common/tests/System/Net/Configuration.Http.cs b/src/libraries/Common/tests/System/Net/Configuration.Http.cs
@@ -64,16 +64,9 @@ public static Uri[] GetEchoServerList()
                 if (PlatformDetection.IsFirefox)
                 {
                     // https://github.com/dotnet/runtime/issues/101115
-                    // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                    // return [RemoteEchoServer];
-                    return [];
+                    return [RemoteEchoServer];
                 }
-                return [
-                    // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                    // RemoteEchoServer,
-                    SecureRemoteEchoServer,
-                    Http2RemoteEchoServer
-                ];
+                return [RemoteEchoServer, SecureRemoteEchoServer, Http2RemoteEchoServer];
             }
 
             public static readonly Uri RemoteVerifyUploadServer = new Uri("http://" + Host + "/" + VerifyUploadHandler);
@@ -89,20 +82,8 @@ public static Uri[] GetEchoServerList()
             public static Uri RemoteLoopServer => new Uri("ws://" + RemoteLoopHost + "/" + RemoteLoopHandler);
 
             public static readonly object[][] EchoServers = GetEchoServerList().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) } };
@@ -117,17 +98,9 @@ public static IEnumerable<RemoteServer> GetRemoteServers()
                 if (PlatformDetection.IsFirefox)
                 {
                     // https://github.com/dotnet/runtime/issues/101115
-                    // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                    // return new RemoteServer[] { RemoteHttp11Server };
-                    return [];
+                    return new RemoteServer[] { RemoteHttp11Server };
                 }
-                return new RemoteServer[]
-                {
-                    // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                    // RemoteHttp11Server,
-                    RemoteSecureHttp11Server,
-                    RemoteHttp2Server
-                };
+                return new RemoteServer[] { RemoteHttp11Server, RemoteSecureHttp11Server, RemoteHttp2Server };
             }
 
             public static readonly IEnumerable<object[]> RemoteServersMemberData = GetRemoteServers().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
@@ -28,14 +28,11 @@ public static object[][] GetEchoServers()
                 {
                     // https://github.com/dotnet/runtime/issues/101115
                     return new object[][] {
-                        // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                        // new object[] { RemoteEchoServer },
-
+                        new object[] { RemoteEchoServer },
                     };
                 }
                 return new object[][] {
-                    // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                    // new object[] { RemoteEchoServer },
+                    new object[] { RemoteEchoServer },
                     new object[] { SecureRemoteEchoServer },
                 };
             }
@@ -46,13 +43,11 @@ public static object[][] GetEchoHeadersServers()
                 {
                     // https://github.com/dotnet/runtime/issues/101115
                     return new object[][] {
-                        // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                        // new object[] { RemoteEchoHeadersServer },
+                        new object[] { RemoteEchoHeadersServer },
                     };
                 }
                 return new object[][] {
-                    // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
-                    // new object[] { RemoteEchoHeadersServer },
+                    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))
                 {
@@ -602,9 +602,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))]
@@ -776,8 +776,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))
                 {
@@ -803,8 +802,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))
                 {
@@ -983,7 +981,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();
@@ -1068,17 +1065,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
@@ -381,7 +381,7 @@ public async Task ExternalServer_DurationMetrics_Recorded()
             using InstrumentRecorder<long> openConnectionsRecorder = SetupInstrumentRecorder<long>(InstrumentNames.OpenConnections);
 
             Uri uri = UseVersion == HttpVersion.Version11
-                ? Test.Common.Configuration.Http.RemoteSecureHttp11Server.EchoUri
+                ? Test.Common.Configuration.Http.RemoteHttp11Server.EchoUri
                 : Test.Common.Configuration.Http.RemoteHttp2Server.EchoUri;
             IPAddress[] addresses = await Dns.GetHostAddressesAsync(uri.Host);
             addresses = addresses.Union(addresses.Select(a => a.MapToIPv6())).ToArray();
@@ -1259,7 +1259,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
`@@ -28,14 +28,11 @@ public static object[][] GetEchoServers()`
`28`	`28`	`{`
`29`	`29`	`// https://github.com/dotnet/runtime/issues/101115`
`30`	`30`	`return new object[][] {`
`31`		`- // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]`
`32`		`- // new object[] { RemoteEchoServer },`
`33`		`-`
	`31`	`+ new object[] { RemoteEchoServer },`
`34`	`32`	`};`
`35`	`33`	`}`
`36`	`34`	`return new object[][] {`
`37`		`- // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]`
`38`		`- // new object[] { RemoteEchoServer },`
	`35`	`+ new object[] { RemoteEchoServer },`
`39`	`36`	`new object[] { SecureRemoteEchoServer },`
`40`	`37`	`};`
`41`	`38`	`}`
`@@ -46,13 +43,11 @@ public static object[][] GetEchoHeadersServers()`
`46`	`43`	`{`
`47`	`44`	`// https://github.com/dotnet/runtime/issues/101115`
`48`	`45`	`return new object[][] {`
`49`		`- // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]`
`50`		`- // new object[] { RemoteEchoHeadersServer },`
	`46`	`+ new object[] { RemoteEchoHeadersServer },`
`51`	`47`	`};`
`52`	`48`	`}`
`53`	`49`	`return new object[][] {`
`54`		`- // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]`
`55`		`- // new object[] { RemoteEchoHeadersServer },`
	`50`	`+ new object[] { RemoteEchoHeadersServer },`
`56`	`51`	`new object[] { SecureRemoteEchoHeadersServer },`
`57`	`52`	`};`
`58`	`53`	`}`
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`	`{`
`@@ -602,9 +602,9 @@ public async Task PostAsync_CallMethod_EmptyContent(Configuration.Http.RemoteSer`
`602`	`602`	`public static IEnumerable<object[]> ExpectContinueVersion()`
`603`	`603`	`{`
`604`	`604`	`return`
`605`		`- from expect in new bool?[] { true, false, null }`
`606`		`- from version in new Version[] { new Version(1, 0), new Version(1, 1), new Version(2, 0) }`
`607`		`- select new object[] { expect, version };`
	`605`	`+ from expect in new bool?[] {true, false, null}`
	`606`	`+ from version in new Version[] {new Version(1, 0), new Version(1, 1), new Version(2, 0)}`
	`607`	`+ select new object[] {expect, version};`
`608`	`608`	`}`
`609`	`609`
`610`	`610`	`[OuterLoop("Uses external servers", typeof(PlatformDetection), nameof(PlatformDetection.LocalEchoServerIsNotAvailable))]`
`@@ -776,8 +776,7 @@ public async Task SendAsync_SendRequestUsingMethodToEchoServerWithNoContent_Meth`
`776`	`776`	`{`
`777`	`777`	`var request = new HttpRequestMessage(`
`778`	`778`	`new HttpMethod(method),`
`779`		`- serverUri)`
`780`		`- { Version = UseVersion };`
	`779`	`+ serverUri) { Version = UseVersion };`
`781`	`780`
`782`	`781`	`using (HttpResponseMessage response = await client.SendAsync(TestAsync, request))`
`783`	`782`	`{`
`@@ -803,8 +802,7 @@ public async Task SendAsync_SendRequestUsingMethodToEchoServerWithContent_Succes`
`803`	`802`	`{`
`804`	`803`	`var request = new HttpRequestMessage(`
`805`	`804`	`new HttpMethod(method),`
`806`		`- serverUri)`
`807`		`- { Version = UseVersion };`
	`805`	`+ serverUri) { Version = UseVersion };`
`808`	`806`	`request.Content = new StringContent(ExpectedContent);`
`809`	`807`	`using (HttpResponseMessage response = await client.SendAsync(TestAsync, request))`
`810`	`808`	`{`
`@@ -983,7 +981,6 @@ public async Task GetAsync_AllowAutoRedirectTrue_RedirectFromHttpToHttp_StatusCo`
`983`	`981`	`[OuterLoop("Uses external servers")]`
`984`	`982`	`[Fact]`
`985`	`983`	`[ActiveIssue("https://github.com/dotnet/runtime/issues/55083", TestPlatforms.Browser)]`
`986`		`- [ActiveIssue("https://github.com/dotnet/runtime/issues/110578")]`
`987`	`984`	`public async Task GetAsync_AllowAutoRedirectTrue_RedirectFromHttpToHttps_StatusCodeOK()`
`988`	`985`	`{`
`989`	`986`	`HttpClientHandler handler = CreateHttpClientHandler();`
`@@ -1068,17 +1065,17 @@ public async Task GetAsync_MaxAutomaticRedirectionsNServerHops_ThrowsIfTooMany(i`
`1068`	`1065`	`handler.MaxAutomaticRedirections = maxHops;`
`1069`	`1066`	`using (HttpClient client = CreateHttpClient(handler))`
`1070`	`1067`	`{`
`1071`		`- Task<HttpResponseMessage> t = client.GetAsync(Configuration.Http.RemoteSecureHttp11Server.RedirectUriForDestinationUri(`
	`1068`	`+ Task<HttpResponseMessage> t = client.GetAsync(Configuration.Http.RemoteHttp11Server.RedirectUriForDestinationUri(`
`1072`	`1069`	`statusCode: 302,`
`1073`		`- destinationUri: Configuration.Http.RemoteSecureHttp11Server.EchoUri,`
	`1070`	`+ destinationUri: Configuration.Http.RemoteHttp11Server.EchoUri,`
`1074`	`1071`	`hops: hops));`
`1075`	`1072`
`1076`	`1073`	`if (hops <= maxHops)`
`1077`	`1074`	`{`
`1078`	`1075`	`using (HttpResponseMessage response = await t)`
`1079`	`1076`	`{`
`1080`	`1077`	`Assert.Equal(HttpStatusCode.OK, response.StatusCode);`
`1081`		`- Assert.Equal(Configuration.Http.SecureRemoteEchoServer, response.RequestMessage.RequestUri);`
	`1078`	`+ Assert.Equal(Configuration.Http.RemoteEchoServer, response.RequestMessage.RequestUri);`
`1082`	`1079`	`}`
`1083`	`1080`	`}`
`1084`	`1081`	`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;`