Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/9.0] Disable tests targetting http://corefx-net-http11.azurewebsites.net #111402

Merged
merged 2 commits into from
Jan 15, 2025
Merged

[release/9.0] Disable tests targetting http://corefx-net-http11.azurewebsites.net #111402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa5d690
Disable more tests dependent on http://corefx-net-http11.azurewebsite…
rzikm Jan 14, 2025
58c1f6a
Disable tests using http://corefx-net-http11.azurewebsites.net (#111235)
rzikm Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions src/libraries/Common/tests/System/Net/Configuration.Http.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,16 @@ 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 [];
}
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);
Expand All @@ -82,8 +89,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) } };
Expand All @@ -97,9 +116,17 @@ public static IEnumerable<RemoteServer> 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 [];
}
return new RemoteServer[] { RemoteHttp11Server, RemoteSecureHttp11Server, RemoteHttp2Server };
return new RemoteServer[]
{
// [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
// RemoteHttp11Server,
RemoteSecureHttp11Server,
RemoteHttp2Server
};
}

public static readonly IEnumerable<object[]> RemoteServersMemberData = GetRemoteServers().Select(s => new object[] { s });
Expand Down
13 changes: 9 additions & 4 deletions src/libraries/Common/tests/System/Net/Configuration.WebSockets.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
};
}
Expand All @@ -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 },
};
}
Expand Down
21 changes: 12 additions & 9 deletions src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.RemoteServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public async Task UseDefaultCredentials_SetToFalseAndServerNeedsAuth_StatusCodeU
handler.UseDefaultCredentials = false;
using (HttpClient client = CreateHttpClient(handler))
{
Uri uri = Configuration.Http.RemoteHttp11Server.NegotiateAuthUriForDefaultCreds;
Uri uri = Configuration.Http.RemoteSecureHttp11Server.NegotiateAuthUriForDefaultCreds;
_output.WriteLine("Uri: {0}", uri);
using (HttpResponseMessage response = await client.GetAsync(uri))
{
Expand Down Expand Up @@ -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))]
Expand Down Expand Up @@ -775,7 +775,8 @@ 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))
{
Expand All @@ -801,7 +802,8 @@ 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))
{
Expand Down Expand Up @@ -980,6 +982,7 @@ 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();
Expand Down Expand Up @@ -1064,17 +1067,17 @@ public async Task GetAsync_MaxAutomaticRedirectionsNServerHops_ThrowsIfTooMany(i
handler.MaxAutomaticRedirections = maxHops;
using (HttpClient client = CreateHttpClient(handler))
{
Task<HttpResponseMessage> t = client.GetAsync(Configuration.Http.RemoteHttp11Server.RedirectUriForDestinationUri(
Task<HttpResponseMessage> t = client.GetAsync(Configuration.Http.RemoteSecureHttp11Server.RedirectUriForDestinationUri(
statusCode: 302,
destinationUri: Configuration.Http.RemoteHttp11Server.EchoUri,
destinationUri: Configuration.Http.RemoteSecureHttp11Server.EchoUri,
hops: hops));

if (hops <= maxHops)
{
using (HttpResponseMessage response = await t)
{
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
Assert.Equal(Configuration.Http.RemoteEchoServer, response.RequestMessage.RequestUri);
Assert.Equal(Configuration.Http.SecureRemoteEchoServer, response.RequestMessage.RequestUri);
}
}
else
Expand Down
1 change: 1 addition & 0 deletions src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ServerCertificates.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ 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();
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/ServerCertificateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ 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();
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/WinHttpHandlerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public async Task GetAsync_RedirectResponseHasCookie_CookieSentToFinalUri(
string cookieName,
string cookieValue)
{
Uri uri = System.Net.Test.Common.Configuration.Http.RemoteHttp11Server.RedirectUriForDestinationUri(302, System.Net.Test.Common.Configuration.Http.RemoteEchoServer, 1);
Uri uri = System.Net.Test.Common.Configuration.Http.RemoteSecureHttp11Server.RedirectUriForDestinationUri(302, System.Net.Test.Common.Configuration.Http.SecureRemoteEchoServer, 1);
var handler = new WinHttpHandler();
handler.WindowsProxyUsePolicy = WindowsProxyUsePolicy.UseWinInetProxy;
handler.CookieUsePolicy = cookieUsePolicy;
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.RemoteHttp11Server.EchoUri
? Test.Common.Configuration.Http.RemoteSecureHttp11Server.EchoUri
: Test.Common.Configuration.Http.RemoteHttp2Server.EchoUri;
IPAddress[] addresses = await Dns.GetHostAddressesAsync(uri.Host);
addresses = addresses.Union(addresses.Select(a => a.MapToIPv6())).ToArray();
Expand Down Expand Up @@ -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]
Expand Down
Loading