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

Remove logging from flaky SSE tests (#2880)

This commit is contained in:
BrennanConroy 2018-08-28 12:52:42 -07:00 committed by GitHub
parent 3bc2cfc3b1
commit f314362ea5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/ts/signalr-protocol-msgpack/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@aspnet/signalr-protocol-msgpack", "name": "@aspnet/signalr-protocol-msgpack",
"version": "1.1.0-preview1-t000", "version": "1.1.0-preview2-t000",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
clients/ts/signalr/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@aspnet/signalr", "name": "@aspnet/signalr",
"version": "1.1.0-preview1-t000", "version": "1.1.0-preview2-t000",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

32
test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs
View File

@ -326,31 +326,23 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
[Fact] [Fact]
public async Task SSEWontStartIfSuccessfulConnectionIsNotEstablished() public async Task SSEWontStartIfSuccessfulConnectionIsNotEstablished()
{ {
bool ExpectedErrors(WriteContext writeContext) // TODO: Add logging https://github.com/aspnet/SignalR/issues/2879
{ var httpHandler = new TestHttpMessageHandler();
return writeContext.LoggerName == typeof(HttpConnection).FullName &&
writeContext.EventId.Name == "ErrorStartingTransport";
}
using (StartVerifiableLog(out var loggerFactory, expectedErrorsFilter: ExpectedErrors)) httpHandler.OnGet("/?id=00000000-0000-0000-0000-000000000000", (_, __) =>
{ {
var httpHandler = new TestHttpMessageHandler(); return Task.FromResult(ResponseUtils.CreateResponse(HttpStatusCode.InternalServerError));
});
httpHandler.OnGet("/?id=00000000-0000-0000-0000-000000000000", (_, __) => var sse = new ServerSentEventsTransport(new HttpClient(httpHandler));
await WithConnectionAsync(
CreateConnection(httpHandler, transport: sse),
async (connection) =>
{ {
return Task.FromResult(ResponseUtils.CreateResponse(HttpStatusCode.InternalServerError)); await Assert.ThrowsAsync<InvalidOperationException>(
() => connection.StartAsync(TransferFormat.Text).OrTimeout());
}); });
var sse = new ServerSentEventsTransport(new HttpClient(httpHandler));
await WithConnectionAsync(
CreateConnection(httpHandler, loggerFactory: loggerFactory, transport: sse),
async (connection) =>
{
await Assert.ThrowsAsync<InvalidOperationException>(
() => connection.StartAsync(TransferFormat.Text).OrTimeout());
});
}
} }
[Fact] [Fact]

10
test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsTransportTests.cs
View File

@ -164,12 +164,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
[Fact] [Fact]
public async Task SSETransportStopsWithErrorIfSendingMessageFails() public async Task SSETransportStopsWithErrorIfSendingMessageFails()
{ {
bool ExpectedErrors(WriteContext writeContext) // TODO: Add logging https://github.com/aspnet/SignalR/issues/2879
{
return writeContext.LoggerName == typeof(ServerSentEventsTransport).FullName &&
writeContext.EventId.Name == "ErrorSending";
}
var eventStreamTcs = new TaskCompletionSource<object>(); var eventStreamTcs = new TaskCompletionSource<object>();
var copyToAsyncTcs = new TaskCompletionSource<int>(); var copyToAsyncTcs = new TaskCompletionSource<int>();
@ -198,9 +193,8 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
}); });
using (var httpClient = new HttpClient(mockHttpHandler.Object)) using (var httpClient = new HttpClient(mockHttpHandler.Object))
using (StartVerifiableLog(out var loggerFactory, expectedErrorsFilter: ExpectedErrors))
{ {
var sseTransport = new ServerSentEventsTransport(httpClient, loggerFactory); var sseTransport = new ServerSentEventsTransport(httpClient);
await sseTransport.StartAsync( await sseTransport.StartAsync(
new Uri("http://fakeuri.org"), TransferFormat.Text).OrTimeout(); new Uri("http://fakeuri.org"), TransferFormat.Text).OrTimeout();