From 30721d0ee71f36288a7a925087e92f694cbc4cb8 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Thu, 9 Jan 2025 13:54:06 +0100 Subject: [PATCH 1/2] Disable tests to corefx-net-http11 --- .../tests/System/Net/Configuration.Http.cs | 37 ++++++++++++++++--- .../System/Net/Configuration.WebSockets.cs | 13 +++++-- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/src/libraries/Common/tests/System/Net/Configuration.Http.cs b/src/libraries/Common/tests/System/Net/Configuration.Http.cs index f568e54f261d22..379f64f31bab30 100644 --- a/src/libraries/Common/tests/System/Net/Configuration.Http.cs +++ b/src/libraries/Common/tests/System/Net/Configuration.Http.cs @@ -64,9 +64,15 @@ public static Uri[] GetEchoServerList() if (PlatformDetection.IsFirefox) { // https://github.com/dotnet/runtime/issues/101115 - return [RemoteEchoServer]; + // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)] + // return [RemoteEchoServer]; } - return [RemoteEchoServer, SecureRemoteEchoServer, Http2RemoteEchoServer]; + return [ + // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)] + // RemoteEchoServer, + SecureRemoteEchoServer, + Http2RemoteEchoServer + ]; } public static readonly Uri RemoteVerifyUploadServer = new Uri("http://" + Host + "/" + VerifyUploadHandler); @@ -82,8 +88,20 @@ 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 = { 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[][] 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[][] Http2Servers = { new object[] { new Uri("https://" + Http2Host) } }; public static readonly object[][] Http2NoPushServers = { new object[] { new Uri("https://" + Http2NoPushHost) } }; @@ -97,9 +115,16 @@ public static IEnumerable GetRemoteServers() if (PlatformDetection.IsFirefox) { // https://github.com/dotnet/runtime/issues/101115 - return new RemoteServer[] { RemoteHttp11Server }; + // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)] + // return new RemoteServer[] { RemoteHttp11Server }; } - return new RemoteServer[] { RemoteHttp11Server, RemoteSecureHttp11Server, RemoteHttp2Server }; + return new RemoteServer[] + { + // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)] + // RemoteHttp11Server, + RemoteSecureHttp11Server, + RemoteHttp2Server + }; } public static readonly IEnumerable 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 index c5686be67b4ef9..d0f1eab545177e 100644 --- a/src/libraries/Common/tests/System/Net/Configuration.WebSockets.cs +++ b/src/libraries/Common/tests/System/Net/Configuration.WebSockets.cs @@ -28,11 +28,14 @@ public static object[][] GetEchoServers() { // https://github.com/dotnet/runtime/issues/101115 return new object[][] { - new object[] { RemoteEchoServer }, + // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)] + // new object[] { RemoteEchoServer }, + }; } return new object[][] { - new object[] { RemoteEchoServer }, + // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)] + // new object[] { RemoteEchoServer }, new object[] { SecureRemoteEchoServer }, }; } @@ -43,11 +46,13 @@ public static object[][] GetEchoHeadersServers() { // https://github.com/dotnet/runtime/issues/101115 return new object[][] { - new object[] { RemoteEchoHeadersServer }, + // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)] + // new object[] { RemoteEchoHeadersServer }, }; } return new object[][] { - new object[] { RemoteEchoHeadersServer }, + // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)] + // new object[] { RemoteEchoHeadersServer }, new object[] { SecureRemoteEchoHeadersServer }, }; } From 160885de8b51a1881fb13e948938f7b17139342e Mon Sep 17 00:00:00 2001 From: Radek Zikmund <32671551+rzikm@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:16:47 +0100 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Miha Zupan --- src/libraries/Common/tests/System/Net/Configuration.Http.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libraries/Common/tests/System/Net/Configuration.Http.cs b/src/libraries/Common/tests/System/Net/Configuration.Http.cs index 379f64f31bab30..f7e6fc759c0dd5 100644 --- a/src/libraries/Common/tests/System/Net/Configuration.Http.cs +++ b/src/libraries/Common/tests/System/Net/Configuration.Http.cs @@ -66,6 +66,7 @@ public static Uri[] GetEchoServerList() // https://github.com/dotnet/runtime/issues/101115 // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)] // return [RemoteEchoServer]; + return []; } return [ // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)] @@ -117,6 +118,7 @@ public static IEnumerable GetRemoteServers() // https://github.com/dotnet/runtime/issues/101115 // [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)] // return new RemoteServer[] { RemoteHttp11Server }; + return []; } return new RemoteServer[] {