Skip to content

Commit fa5d690

Browse files
committed
* Disable more tests dependent on http://corefx-net-http11.azurewebsites.net * Disable winhttphandlertests
1 parent 01ad3ef commit fa5d690

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.RemoteServer.cs

+12-9
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public async Task UseDefaultCredentials_SetToFalseAndServerNeedsAuth_StatusCodeU
7070
handler.UseDefaultCredentials = false;
7171
using (HttpClient client = CreateHttpClient(handler))
7272
{
73-
Uri uri = Configuration.Http.RemoteHttp11Server.NegotiateAuthUriForDefaultCreds;
73+
Uri uri = Configuration.Http.RemoteSecureHttp11Server.NegotiateAuthUriForDefaultCreds;
7474
_output.WriteLine("Uri: {0}", uri);
7575
using (HttpResponseMessage response = await client.GetAsync(uri))
7676
{
@@ -601,9 +601,9 @@ public async Task PostAsync_CallMethod_EmptyContent(Configuration.Http.RemoteSer
601601
public static IEnumerable<object[]> ExpectContinueVersion()
602602
{
603603
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 };
607607
}
608608

609609
[OuterLoop("Uses external servers", typeof(PlatformDetection), nameof(PlatformDetection.LocalEchoServerIsNotAvailable))]
@@ -775,7 +775,8 @@ public async Task SendAsync_SendRequestUsingMethodToEchoServerWithNoContent_Meth
775775
{
776776
var request = new HttpRequestMessage(
777777
new HttpMethod(method),
778-
serverUri) { Version = UseVersion };
778+
serverUri)
779+
{ Version = UseVersion };
779780

780781
using (HttpResponseMessage response = await client.SendAsync(TestAsync, request))
781782
{
@@ -801,7 +802,8 @@ public async Task SendAsync_SendRequestUsingMethodToEchoServerWithContent_Succes
801802
{
802803
var request = new HttpRequestMessage(
803804
new HttpMethod(method),
804-
serverUri) { Version = UseVersion };
805+
serverUri)
806+
{ Version = UseVersion };
805807
request.Content = new StringContent(ExpectedContent);
806808
using (HttpResponseMessage response = await client.SendAsync(TestAsync, request))
807809
{
@@ -980,6 +982,7 @@ public async Task GetAsync_AllowAutoRedirectTrue_RedirectFromHttpToHttp_StatusCo
980982
[OuterLoop("Uses external servers")]
981983
[Fact]
982984
[ActiveIssue("https://github.com/dotnet/runtime/issues/55083", TestPlatforms.Browser)]
985+
[ActiveIssue("https://github.com/dotnet/runtime/issues/110578")]
983986
public async Task GetAsync_AllowAutoRedirectTrue_RedirectFromHttpToHttps_StatusCodeOK()
984987
{
985988
HttpClientHandler handler = CreateHttpClientHandler();
@@ -1064,17 +1067,17 @@ public async Task GetAsync_MaxAutomaticRedirectionsNServerHops_ThrowsIfTooMany(i
10641067
handler.MaxAutomaticRedirections = maxHops;
10651068
using (HttpClient client = CreateHttpClient(handler))
10661069
{
1067-
Task<HttpResponseMessage> t = client.GetAsync(Configuration.Http.RemoteHttp11Server.RedirectUriForDestinationUri(
1070+
Task<HttpResponseMessage> t = client.GetAsync(Configuration.Http.RemoteSecureHttp11Server.RedirectUriForDestinationUri(
10681071
statusCode: 302,
1069-
destinationUri: Configuration.Http.RemoteHttp11Server.EchoUri,
1072+
destinationUri: Configuration.Http.RemoteSecureHttp11Server.EchoUri,
10701073
hops: hops));
10711074

10721075
if (hops <= maxHops)
10731076
{
10741077
using (HttpResponseMessage response = await t)
10751078
{
10761079
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
1077-
Assert.Equal(Configuration.Http.RemoteEchoServer, response.RequestMessage.RequestUri);
1080+
Assert.Equal(Configuration.Http.SecureRemoteEchoServer, response.RequestMessage.RequestUri);
10781081
}
10791082
}
10801083
else

src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ServerCertificates.cs

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public async Task NoCallback_ValidCertificate_SuccessAndExpectedPropertyBehavior
9797

9898
[OuterLoop("Uses external servers")]
9999
[Fact]
100+
[ActiveIssue("https://github.com/dotnet/runtime/issues/110578")]
100101
public async Task UseCallback_NotSecureConnection_CallbackNotCalled()
101102
{
102103
HttpClientHandler handler = CreateHttpClientHandler();

src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/ServerCertificateTest.cs

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public async Task NoCallback_ValidCertificate_CallbackNotCalled()
3232

3333
[OuterLoop]
3434
[Fact]
35+
[ActiveIssue("https://github.com/dotnet/runtime/issues/110578")]
3536
public async Task UseCallback_NotSecureConnection_CallbackNotCalled()
3637
{
3738
var handler = new WinHttpHandler();

src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/WinHttpHandlerTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public async Task GetAsync_RedirectResponseHasCookie_CookieSentToFinalUri(
5555
string cookieName,
5656
string cookieValue)
5757
{
58-
Uri uri = System.Net.Test.Common.Configuration.Http.RemoteHttp11Server.RedirectUriForDestinationUri(302, System.Net.Test.Common.Configuration.Http.RemoteEchoServer, 1);
58+
Uri uri = System.Net.Test.Common.Configuration.Http.RemoteSecureHttp11Server.RedirectUriForDestinationUri(302, System.Net.Test.Common.Configuration.Http.SecureRemoteEchoServer, 1);
5959
var handler = new WinHttpHandler();
6060
handler.WindowsProxyUsePolicy = WindowsProxyUsePolicy.UseWinInetProxy;
6161
handler.CookieUsePolicy = cookieUsePolicy;

src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ public async Task ExternalServer_DurationMetrics_Recorded()
381381
using InstrumentRecorder<long> openConnectionsRecorder = SetupInstrumentRecorder<long>(InstrumentNames.OpenConnections);
382382

383383
Uri uri = UseVersion == HttpVersion.Version11
384-
? Test.Common.Configuration.Http.RemoteHttp11Server.EchoUri
384+
? Test.Common.Configuration.Http.RemoteSecureHttp11Server.EchoUri
385385
: Test.Common.Configuration.Http.RemoteHttp2Server.EchoUri;
386386
IPAddress[] addresses = await Dns.GetHostAddressesAsync(uri.Host);
387387
addresses = addresses.Union(addresses.Select(a => a.MapToIPv6())).ToArray();
@@ -1259,7 +1259,7 @@ public Task RequestDuration_Redirect_RecordedForEachHttpSpan()
12591259
});
12601260

12611261
}, options: new GenericLoopbackOptions() { UseSsl = true });
1262-
}, options: new GenericLoopbackOptions() { UseSsl = false});
1262+
}, options: new GenericLoopbackOptions() { UseSsl = false });
12631263
}
12641264

12651265
[Fact]

0 commit comments

Comments
 (0)