Skip to content

Commit f6cafb9

Browse files
rzikmrzikm
authored
Revert disabling of tests for HTTP servers (#114196)
* 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.
1 parent 1abd812 commit f6cafb9

File tree

7 files changed

+22
-59
lines changed

7 files changed

+22
-59
lines changed

‎src/libraries/Common/tests/System/Net/Configuration.Http.cs‎

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,9 @@ public static Uri[] GetEchoServerList()
6464
if (PlatformDetection.IsFirefox)
6565
{
6666
// https://github.com/dotnet/runtime/issues/101115
67-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
68-
// return [RemoteEchoServer];
69-
return [];
67+
return [RemoteEchoServer];
7068
}
71-
return [
72-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
73-
// RemoteEchoServer,
74-
SecureRemoteEchoServer,
75-
Http2RemoteEchoServer
76-
];
69+
return [RemoteEchoServer, SecureRemoteEchoServer, Http2RemoteEchoServer];
7770
}
7871

7972
public static readonly Uri RemoteVerifyUploadServer = new Uri("http://" + Host + "/" + VerifyUploadHandler);
@@ -89,20 +82,8 @@ public static Uri[] GetEchoServerList()
8982
public static Uri RemoteLoopServer => new Uri("ws://" + RemoteLoopHost + "/" + RemoteLoopHandler);
9083

9184
public static readonly object[][] EchoServers = GetEchoServerList().Select(x => new object[] { x }).ToArray();
92-
public static readonly object[][] VerifyUploadServers = {
93-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
94-
// new object[] { RemoteVerifyUploadServer },
95-
new object[] { SecureRemoteVerifyUploadServer },
96-
new object[] { Http2RemoteVerifyUploadServer }
97-
};
98-
99-
public static readonly object[][] CompressedServers = {
100-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
101-
// new object[] { RemoteDeflateServer },
102-
new object[] { RemoteGZipServer },
103-
new object[] { Http2RemoteDeflateServer },
104-
new object[] { Http2RemoteGZipServer }
105-
};
85+
public static readonly object[][] VerifyUploadServers = { new object[] { RemoteVerifyUploadServer }, new object[] { SecureRemoteVerifyUploadServer }, new object[] { Http2RemoteVerifyUploadServer } };
86+
public static readonly object[][] CompressedServers = { new object[] { RemoteDeflateServer }, new object[] { RemoteGZipServer }, new object[] { Http2RemoteDeflateServer }, new object[] { Http2RemoteGZipServer } };
10687

10788
public static readonly object[][] Http2Servers = { new object[] { new Uri("https://" + Http2Host) } };
10889
public static readonly object[][] Http2NoPushServers = { new object[] { new Uri("https://" + Http2NoPushHost) } };
@@ -117,17 +98,9 @@ public static IEnumerable<RemoteServer> GetRemoteServers()
11798
if (PlatformDetection.IsFirefox)
11899
{
119100
// https://github.com/dotnet/runtime/issues/101115
120-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
121-
// return new RemoteServer[] { RemoteHttp11Server };
122-
return [];
101+
return new RemoteServer[] { RemoteHttp11Server };
123102
}
124-
return new RemoteServer[]
125-
{
126-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
127-
// RemoteHttp11Server,
128-
RemoteSecureHttp11Server,
129-
RemoteHttp2Server
130-
};
103+
return new RemoteServer[] { RemoteHttp11Server, RemoteSecureHttp11Server, RemoteHttp2Server };
131104
}
132105

133106
public static readonly IEnumerable<object[]> RemoteServersMemberData = GetRemoteServers().Select(s => new object[] { s });

‎src/libraries/Common/tests/System/Net/Configuration.WebSockets.cs‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,11 @@ public static object[][] GetEchoServers()
2828
{
2929
// https://github.com/dotnet/runtime/issues/101115
3030
return new object[][] {
31-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
32-
// new object[] { RemoteEchoServer },
33-
31+
new object[] { RemoteEchoServer },
3432
};
3533
}
3634
return new object[][] {
37-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
38-
// new object[] { RemoteEchoServer },
35+
new object[] { RemoteEchoServer },
3936
new object[] { SecureRemoteEchoServer },
4037
};
4138
}
@@ -46,13 +43,11 @@ public static object[][] GetEchoHeadersServers()
4643
{
4744
// https://github.com/dotnet/runtime/issues/101115
4845
return new object[][] {
49-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
50-
// new object[] { RemoteEchoHeadersServer },
46+
new object[] { RemoteEchoHeadersServer },
5147
};
5248
}
5349
return new object[][] {
54-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/110578)]
55-
// new object[] { RemoteEchoHeadersServer },
50+
new object[] { RemoteEchoHeadersServer },
5651
new object[] { SecureRemoteEchoHeadersServer },
5752
};
5853
}

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public async Task UseDefaultCredentials_SetToFalseAndServerNeedsAuth_StatusCodeU
7171
handler.UseDefaultCredentials = false;
7272
using (HttpClient client = CreateHttpClient(handler))
7373
{
74-
Uri uri = Configuration.Http.RemoteSecureHttp11Server.NegotiateAuthUriForDefaultCreds;
74+
Uri uri = Configuration.Http.RemoteHttp11Server.NegotiateAuthUriForDefaultCreds;
7575
_output.WriteLine("Uri: {0}", uri);
7676
using (HttpResponseMessage response = await client.GetAsync(uri))
7777
{
@@ -603,9 +603,9 @@ public async Task PostAsync_CallMethod_EmptyContent(Configuration.Http.RemoteSer
603603
public static IEnumerable<object[]> ExpectContinueVersion()
604604
{
605605
return
606-
from expect in new bool?[] { true, false, null }
607-
from version in new Version[] { new Version(1, 0), new Version(1, 1), new Version(2, 0) }
608-
select new object[] { expect, version };
606+
from expect in new bool?[] {true, false, null}
607+
from version in new Version[] {new Version(1, 0), new Version(1, 1), new Version(2, 0)}
608+
select new object[] {expect, version};
609609
}
610610

611611
[OuterLoop("Uses external servers", typeof(PlatformDetection), nameof(PlatformDetection.LocalEchoServerIsNotAvailable))]
@@ -777,8 +777,7 @@ public async Task SendAsync_SendRequestUsingMethodToEchoServerWithNoContent_Meth
777777
{
778778
var request = new HttpRequestMessage(
779779
new HttpMethod(method),
780-
serverUri)
781-
{ Version = UseVersion };
780+
serverUri) { Version = UseVersion };
782781

783782
using (HttpResponseMessage response = await client.SendAsync(TestAsync, request))
784783
{
@@ -804,8 +803,7 @@ public async Task SendAsync_SendRequestUsingMethodToEchoServerWithContent_Succes
804803
{
805804
var request = new HttpRequestMessage(
806805
new HttpMethod(method),
807-
serverUri)
808-
{ Version = UseVersion };
806+
serverUri) { Version = UseVersion };
809807
request.Content = new StringContent(ExpectedContent);
810808
using (HttpResponseMessage response = await client.SendAsync(TestAsync, request))
811809
{
@@ -984,7 +982,6 @@ public async Task GetAsync_AllowAutoRedirectTrue_RedirectFromHttpToHttp_StatusCo
984982
[OuterLoop("Uses external servers")]
985983
[Fact]
986984
[ActiveIssue("https://github.com/dotnet/runtime/issues/55083", TestPlatforms.Browser)]
987-
[ActiveIssue("https://github.com/dotnet/runtime/issues/110578")]
988985
public async Task GetAsync_AllowAutoRedirectTrue_RedirectFromHttpToHttps_StatusCodeOK()
989986
{
990987
HttpClientHandler handler = CreateHttpClientHandler();
@@ -1069,17 +1066,17 @@ public async Task GetAsync_MaxAutomaticRedirectionsNServerHops_ThrowsIfTooMany(i
10691066
handler.MaxAutomaticRedirections = maxHops;
10701067
using (HttpClient client = CreateHttpClient(handler))
10711068
{
1072-
Task<HttpResponseMessage> t = client.GetAsync(Configuration.Http.RemoteSecureHttp11Server.RedirectUriForDestinationUri(
1069+
Task<HttpResponseMessage> t = client.GetAsync(Configuration.Http.RemoteHttp11Server.RedirectUriForDestinationUri(
10731070
statusCode: 302,
1074-
destinationUri: Configuration.Http.RemoteSecureHttp11Server.EchoUri,
1071+
destinationUri: Configuration.Http.RemoteHttp11Server.EchoUri,
10751072
hops: hops));
10761073

10771074
if (hops <= maxHops)
10781075
{
10791076
using (HttpResponseMessage response = await t)
10801077
{
10811078
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
1082-
Assert.Equal(Configuration.Http.SecureRemoteEchoServer, response.RequestMessage.RequestUri);
1079+
Assert.Equal(Configuration.Http.RemoteEchoServer, response.RequestMessage.RequestUri);
10831080
}
10841081
}
10851082
else

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ public async Task NoCallback_ValidCertificate_SuccessAndExpectedPropertyBehavior
9797

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public async Task NoCallback_ValidCertificate_CallbackNotCalled()
3232

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public async Task GetAsync_RedirectResponseHasCookie_CookieSentToFinalUri(
7878
string cookieName,
7979
string cookieValue)
8080
{
81-
Uri uri = System.Net.Test.Common.Configuration.Http.RemoteSecureHttp11Server.RedirectUriForDestinationUri(302, System.Net.Test.Common.Configuration.Http.SecureRemoteEchoServer, 1);
81+
Uri uri = System.Net.Test.Common.Configuration.Http.RemoteHttp11Server.RedirectUriForDestinationUri(302, System.Net.Test.Common.Configuration.Http.RemoteEchoServer, 1);
8282
var handler = new WinHttpHandler();
8383
handler.WindowsProxyUsePolicy = WindowsProxyUsePolicy.UseWinInetProxy;
8484
handler.CookieUsePolicy = cookieUsePolicy;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ public async Task ExternalServer_DurationMetrics_Recorded()
382382
using InstrumentRecorder<long> openConnectionsRecorder = SetupInstrumentRecorder<long>(InstrumentNames.OpenConnections);
383383

384384
Uri uri = UseVersion == HttpVersion.Version11
385-
? Test.Common.Configuration.Http.RemoteSecureHttp11Server.EchoUri
385+
? Test.Common.Configuration.Http.RemoteHttp11Server.EchoUri
386386
: Test.Common.Configuration.Http.RemoteHttp2Server.EchoUri;
387387
IPAddress[] addresses = await Dns.GetHostAddressesAsync(uri.Host);
388388
addresses = addresses.Union(addresses.Select(a => a.MapToIPv6())).ToArray();
@@ -1261,7 +1261,7 @@ public Task RequestDuration_Redirect_RecordedForEachHttpSpan()
12611261
});
12621262

12631263
}, options: new GenericLoopbackOptions() { UseSsl = true });
1264-
}, options: new GenericLoopbackOptions() { UseSsl = false });
1264+
}, options: new GenericLoopbackOptions() { UseSsl = false});
12651265
}
12661266

12671267
[Fact]

0 commit comments

Comments
 (0)