Skip to content

Commit e37ddbc

Browse files
TratcherTratcher
authored
Fix WebSocket test port (#29336)
1 parent fbc606e commit e37ddbc

File tree

2 files changed

+24
-21
lines changed

2 files changed

+24
-21
lines changed

‎src/Middleware/WebSockets/test/UnitTests/KestrelWebSocketHelpers.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5+
using System.Net;
56
using System.Threading.Tasks;
67
using Microsoft.AspNetCore.Builder;
78
using Microsoft.AspNetCore.Hosting;
89
using Microsoft.AspNetCore.Http;
910
using Microsoft.Extensions.Configuration;
10-
using Microsoft.Extensions.Logging;
1111
using Microsoft.Extensions.DependencyInjection;
1212
using Microsoft.Extensions.Hosting;
13+
using Microsoft.Extensions.Logging;
1314

1415
namespace Microsoft.AspNetCore.WebSockets.Test
1516
{
@@ -47,7 +48,6 @@ public static IDisposable CreateServer(ILoggerFactory loggerFactory, out int por
4748
var configBuilder = new ConfigurationBuilder();
4849
configBuilder.AddInMemoryCollection();
4950
var config = configBuilder.Build();
50-
config["server.urls"] = $"http://127.0.0.1:0";
5151

5252
var host = new HostBuilder()
5353
.ConfigureWebHost(webHostBuilder =>
@@ -59,7 +59,10 @@ public static IDisposable CreateServer(ILoggerFactory loggerFactory, out int por
5959
s.AddSingleton(loggerFactory);
6060
})
6161
.UseConfiguration(config)
62-
.UseKestrel()
62+
.UseKestrel(options =>
63+
{
64+
options.Listen(IPAddress.Loopback, 0);
65+
})
6366
.Configure(startup);
6467
}).Build();
6568

‎src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public async Task Connect_Success()
2828
{
2929
using (var client = new ClientWebSocket())
3030
{
31-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
31+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
3232
}
3333
}
3434
}
@@ -48,7 +48,7 @@ public async Task NegotiateSubProtocol_Success()
4848
client.Options.AddSubProtocol("alpha");
4949
client.Options.AddSubProtocol("bravo");
5050
client.Options.AddSubProtocol("charlie");
51-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
51+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
5252

5353
// The Windows version of ClientWebSocket uses the casing from the header (Bravo)
5454
// However, the Managed version seems match the header against the list generated by
@@ -78,7 +78,7 @@ public async Task SendEmptyData_Success()
7878
{
7979
using (var client = new ClientWebSocket())
8080
{
81-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
81+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
8282
var orriginalData = new byte[0];
8383
await client.SendAsync(new ArraySegment<byte>(orriginalData), WebSocketMessageType.Binary, true, CancellationToken.None);
8484
}
@@ -104,7 +104,7 @@ public async Task SendShortData_Success()
104104
{
105105
using (var client = new ClientWebSocket())
106106
{
107-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
107+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
108108
await client.SendAsync(new ArraySegment<byte>(orriginalData), WebSocketMessageType.Binary, true, CancellationToken.None);
109109
}
110110
}
@@ -129,7 +129,7 @@ public async Task SendMediumData_Success()
129129
{
130130
using (var client = new ClientWebSocket())
131131
{
132-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
132+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
133133
await client.SendAsync(new ArraySegment<byte>(orriginalData), WebSocketMessageType.Binary, true, CancellationToken.None);
134134
}
135135
}
@@ -166,7 +166,7 @@ public async Task SendLongData_Success()
166166
{
167167
using (var client = new ClientWebSocket())
168168
{
169-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
169+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
170170
await client.SendAsync(new ArraySegment<byte>(orriginalData), WebSocketMessageType.Binary, true, CancellationToken.None);
171171
}
172172
}
@@ -207,7 +207,7 @@ public async Task SendFragmentedData_Success()
207207
{
208208
using (var client = new ClientWebSocket())
209209
{
210-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
210+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
211211
await client.SendAsync(new ArraySegment<byte>(orriginalData, 0, 2), WebSocketMessageType.Binary, false, CancellationToken.None);
212212
await client.SendAsync(new ArraySegment<byte>(orriginalData, 2, 2), WebSocketMessageType.Binary, false, CancellationToken.None);
213213
await client.SendAsync(new ArraySegment<byte>(orriginalData, 4, 7), WebSocketMessageType.Binary, true, CancellationToken.None);
@@ -229,7 +229,7 @@ public async Task ReceiveShortData_Success()
229229
{
230230
using (var client = new ClientWebSocket())
231231
{
232-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
232+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
233233
var clientBuffer = new byte[orriginalData.Length];
234234
var result = await client.ReceiveAsync(new ArraySegment<byte>(clientBuffer), CancellationToken.None);
235235
Assert.True(result.EndOfMessage);
@@ -254,7 +254,7 @@ public async Task ReceiveMediumData_Success()
254254
{
255255
using (var client = new ClientWebSocket())
256256
{
257-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
257+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
258258
var clientBuffer = new byte[orriginalData.Length];
259259
var result = await client.ReceiveAsync(new ArraySegment<byte>(clientBuffer), CancellationToken.None);
260260
Assert.True(result.EndOfMessage);
@@ -279,7 +279,7 @@ public async Task ReceiveLongData()
279279
{
280280
using (var client = new ClientWebSocket())
281281
{
282-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
282+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
283283
var clientBuffer = new byte[orriginalData.Length];
284284
WebSocketReceiveResult result;
285285
int receivedCount = 0;
@@ -314,7 +314,7 @@ public async Task ReceiveFragmentedData_Success()
314314
{
315315
using (var client = new ClientWebSocket())
316316
{
317-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
317+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
318318
var clientBuffer = new byte[orriginalData.Length];
319319
var result = await client.ReceiveAsync(new ArraySegment<byte>(clientBuffer), CancellationToken.None);
320320
Assert.False(result.EndOfMessage);
@@ -361,7 +361,7 @@ public async Task SendClose_Success()
361361
{
362362
using (var client = new ClientWebSocket())
363363
{
364-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
364+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
365365
await client.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, closeDescription, CancellationToken.None);
366366

367367
Assert.Equal(WebSocketState.CloseSent, client.State);
@@ -383,7 +383,7 @@ public async Task ReceiveClose_Success()
383383
{
384384
using (var client = new ClientWebSocket())
385385
{
386-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
386+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
387387
var clientBuffer = new byte[1024];
388388
var result = await client.ReceiveAsync(new ArraySegment<byte>(clientBuffer), CancellationToken.None);
389389
Assert.True(result.EndOfMessage);
@@ -419,7 +419,7 @@ public async Task CloseFromOpen_Success()
419419
{
420420
using (var client = new ClientWebSocket())
421421
{
422-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
422+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
423423
await client.CloseAsync(WebSocketCloseStatus.NormalClosure, closeDescription, CancellationToken.None);
424424

425425
Assert.Equal(WebSocketState.Closed, client.State);
@@ -449,7 +449,7 @@ public async Task CloseFromCloseSent_Success()
449449
{
450450
using (var client = new ClientWebSocket())
451451
{
452-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
452+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
453453
await client.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, closeDescription, CancellationToken.None);
454454
Assert.Equal(WebSocketState.CloseSent, client.State);
455455

@@ -481,7 +481,7 @@ public async Task CloseFromCloseReceived_Success()
481481
{
482482
using (var client = new ClientWebSocket())
483483
{
484-
await client.ConnectAsync(new Uri($"ws://localhost:{port}/"), CancellationToken.None);
484+
await client.ConnectAsync(new Uri($"ws://127.0.0.1:{port}/"), CancellationToken.None);
485485
var clientBuffer = new byte[1024];
486486
var result = await client.ReceiveAsync(new ArraySegment<byte>(clientBuffer), CancellationToken.None);
487487
Assert.True(result.EndOfMessage);
@@ -527,7 +527,7 @@ public async Task OriginIsValidatedForWebSocketRequests(HttpStatusCode expectedC
527527
{
528528
using (var client = new HttpClient())
529529
{
530-
var uri = new UriBuilder(new Uri($"ws://localhost:{port}/"));
530+
var uri = new UriBuilder(new Uri($"ws://127.0.0.1:{port}/"));
531531
uri.Scheme = "http";
532532

533533
// Craft a valid WebSocket Upgrade request
@@ -561,7 +561,7 @@ public async Task OriginIsNotValidatedForNonWebSocketRequests()
561561
{
562562
using (var client = new HttpClient())
563563
{
564-
var uri = new UriBuilder(new Uri($"ws://localhost:{port}/"));
564+
var uri = new UriBuilder(new Uri($"ws://127.0.0.1:{port}/"));
565565
uri.Scheme = "http";
566566

567567
using (var request = new HttpRequestMessage(HttpMethod.Get, uri.ToString()))

0 commit comments

Comments
 (0)