huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some skipped SignalR tests (#19070)

This commit is contained in:
Brennan 2020-02-26 13:28:46 -08:00 committed by GitHub
parent 4498058343
commit 4ac890983e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/WebSocketsTransport.cs
View File

@ -36,8 +36,14 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
{ {
_webSocket = new ClientWebSocket(); _webSocket = new ClientWebSocket();
// Issue in ClientWebSocket prevents user-agent being set - https://github.com/dotnet/corefx/issues/26627 // Full Framework will throw when trying to set the User-Agent header
//_webSocket.Options.SetRequestHeader("User-Agent", Constants.UserAgentHeader.ToString()); // So avoid setting it in netstandard2.0 and only set it in netstandard2.1 and higher
#if !NETSTANDARD2_0
_webSocket.Options.SetRequestHeader("User-Agent", Constants.UserAgentHeader.ToString());
#else
// Set an alternative user agent header on Full framework
_webSocket.Options.SetRequestHeader("X-SignalR-User-Agent", Constants.UserAgentHeader.ToString());
#endif
if (httpConnectionOptions != null) if (httpConnectionOptions != null)
{ {

4
src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs
View File

@ -182,7 +182,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
public Task ProtocolError() public Task ProtocolError()
{ {
return Clients.Caller.SendAsync("Send", new string('x', 3000), new SelfRef()); return Clients.Caller.SendAsync("Send", new SelfRef());
} }
public void InvalidArgument(CancellationToken token) public void InvalidArgument(CancellationToken token)
@ -196,7 +196,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
Self = this; Self = this;
} }
public SelfRef Self; public SelfRef Self { get; set; }
} }
public async Task<string> StreamingConcat(ChannelReader<string> source) public async Task<string> StreamingConcat(ChannelReader<string> source)

6
src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs
View File

@ -3210,7 +3210,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
} }
} }
[Fact(Skip = "Object not supported yet")] [Fact]
public async Task UploadStreamedObjects() public async Task UploadStreamedObjects()
{ {
var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(); var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider();
@ -3274,7 +3274,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
} }
} }
[Fact(Skip = "Cyclic parsing is not supported yet")] [Fact]
public async Task ConnectionAbortedIfSendFailsWithProtocolError() public async Task ConnectionAbortedIfSendFailsWithProtocolError()
{ {
using (StartVerifiableLog()) using (StartVerifiableLog())
@ -3290,8 +3290,6 @@ namespace Microsoft.AspNetCore.SignalR.Tests
var connectionHandlerTask = await client.ConnectAsync(connectionHandler).OrTimeout(); var connectionHandlerTask = await client.ConnectAsync(connectionHandler).OrTimeout();
await client.SendInvocationAsync(nameof(MethodHub.ProtocolError)).OrTimeout(); await client.SendInvocationAsync(nameof(MethodHub.ProtocolError)).OrTimeout();
await client.Connected.OrTimeout();
await connectionHandlerTask.OrTimeout(); await connectionHandlerTask.OrTimeout();
} }
} }

7
src/SignalR/server/SignalR/test/WebSocketsTransportTests.cs
View File

@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
} }
} }
[ConditionalFact(Skip = "Issue in ClientWebSocket prevents user-agent being set - https://github.com/dotnet/corefx/issues/26627")] [ConditionalFact]
[WebSocketsSupportedCondition] [WebSocketsSupportedCondition]
public async Task WebSocketsTransportSendsUserAgent() public async Task WebSocketsTransportSendsUserAgent()
{ {
@ -86,7 +86,10 @@ namespace Microsoft.AspNetCore.SignalR.Tests
.Assembly .Assembly
.GetCustomAttribute<AssemblyInformationalVersionAttribute>(); .GetCustomAttribute<AssemblyInformationalVersionAttribute>();
Assert.Equal("Microsoft.AspNetCore.Http.Connections.Client/" + assemblyVersion.InformationalVersion, userAgent); var majorVersion = typeof(HttpConnection).Assembly.GetName().Version.Major;
var minorVersion = typeof(HttpConnection).Assembly.GetName().Version.Minor;
Assert.StartsWith($"Microsoft SignalR/{majorVersion}.{minorVersion} ({assemblyVersion.InformationalVersion}; ", userAgent);
} }
} }