Reenable logging for SSE tests (#3320)
This commit is contained in:
parent
4cbabea501
commit
a5884d3ad7
|
|
@ -322,23 +322,31 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task SSEWontStartIfSuccessfulConnectionIsNotEstablished()
|
public async Task SSEWontStartIfSuccessfulConnectionIsNotEstablished()
|
||||||
{
|
{
|
||||||
// TODO: Add logging https://github.com/aspnet/SignalR/issues/2879
|
bool ExpectedErrors(WriteContext writeContext)
|
||||||
var httpHandler = new TestHttpMessageHandler();
|
|
||||||
|
|
||||||
httpHandler.OnGet("/?id=00000000-0000-0000-0000-000000000000", (_, __) =>
|
|
||||||
{
|
{
|
||||||
return Task.FromResult(ResponseUtils.CreateResponse(HttpStatusCode.InternalServerError));
|
return writeContext.LoggerName == typeof(HttpConnection).FullName &&
|
||||||
});
|
writeContext.EventId.Name == "ErrorStartingTransport";
|
||||||
|
}
|
||||||
|
|
||||||
var sse = new ServerSentEventsTransport(new HttpClient(httpHandler));
|
using (StartVerifiableLog(expectedErrorsFilter: ExpectedErrors))
|
||||||
|
{
|
||||||
|
var httpHandler = new TestHttpMessageHandler();
|
||||||
|
|
||||||
await WithConnectionAsync(
|
httpHandler.OnGet("/?id=00000000-0000-0000-0000-000000000000", (_, __) =>
|
||||||
CreateConnection(httpHandler, transport: sse),
|
|
||||||
async (connection) =>
|
|
||||||
{
|
{
|
||||||
await Assert.ThrowsAsync<InvalidOperationException>(
|
return Task.FromResult(ResponseUtils.CreateResponse(HttpStatusCode.InternalServerError));
|
||||||
() => connection.StartAsync(TransferFormat.Text).OrTimeout());
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var sse = new ServerSentEventsTransport(new HttpClient(httpHandler), LoggerFactory);
|
||||||
|
|
||||||
|
await WithConnectionAsync(
|
||||||
|
CreateConnection(httpHandler, loggerFactory: LoggerFactory, transport: sse),
|
||||||
|
async (connection) =>
|
||||||
|
{
|
||||||
|
await Assert.ThrowsAsync<InvalidOperationException>(
|
||||||
|
() => connection.StartAsync(TransferFormat.Text).OrTimeout());
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ using System.Threading.Tasks;
|
||||||
using Microsoft.AspNetCore.Connections;
|
using Microsoft.AspNetCore.Connections;
|
||||||
using Microsoft.AspNetCore.Http.Connections.Client.Internal;
|
using Microsoft.AspNetCore.Http.Connections.Client.Internal;
|
||||||
using Microsoft.AspNetCore.SignalR.Tests;
|
using Microsoft.AspNetCore.SignalR.Tests;
|
||||||
|
using Microsoft.Extensions.Logging.Testing;
|
||||||
using Moq;
|
using Moq;
|
||||||
using Moq.Protected;
|
using Moq.Protected;
|
||||||
using Xunit;
|
using Xunit;
|
||||||
|
|
@ -156,7 +157,12 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task SSETransportStopsWithErrorIfSendingMessageFails()
|
public async Task SSETransportStopsWithErrorIfSendingMessageFails()
|
||||||
{
|
{
|
||||||
// TODO: Add logging https://github.com/aspnet/SignalR/issues/2879
|
bool ExpectedErrors(WriteContext writeContext)
|
||||||
|
{
|
||||||
|
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>();
|
||||||
|
|
||||||
|
|
@ -185,8 +191,9 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
|
||||||
});
|
});
|
||||||
|
|
||||||
using (var httpClient = new HttpClient(mockHttpHandler.Object))
|
using (var httpClient = new HttpClient(mockHttpHandler.Object))
|
||||||
|
using (StartVerifiableLog(expectedErrorsFilter: ExpectedErrors))
|
||||||
{
|
{
|
||||||
var sseTransport = new ServerSentEventsTransport(httpClient);
|
var sseTransport = new ServerSentEventsTransport(httpClient, LoggerFactory);
|
||||||
|
|
||||||
await sseTransport.StartAsync(
|
await sseTransport.StartAsync(
|
||||||
new Uri("http://fakeuri.org"), TransferFormat.Text).OrTimeout();
|
new Uri("http://fakeuri.org"), TransferFormat.Text).OrTimeout();
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<VersionPrefix>3.0.0</VersionPrefix>
|
<VersionPrefix>3.0.0</VersionPrefix>
|
||||||
<VersionSuffix>alpha1</VersionSuffix>
|
<VersionSuffix>alpha1</VersionSuffix>
|
||||||
<JavaVersionPrefix>1.0.0</JavaVersionPrefix>
|
<JavaVersionPrefix>3.0.0</JavaVersionPrefix>
|
||||||
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
|
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
|
||||||
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
|
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
|
||||||
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
|
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue