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

[Blazor] Improve the reliability of 'JSInteropThrowsInUserCode' (#15219) 

* Moves the Dispose logic into `DisposeAsync` instead
  of `IAsyncLifetime.DisposeAsync`.
* Adds a `try{...}catch{...}` around output.WriteLine to prevent
  situations where writing a log into the ITestOutput outside of the
  context of the test causes an exception that makes the test fail.
This commit is contained in:
Javier Calvarro Nelson 2019-10-21 19:32:42 +02:00 committed by GitHub
parent fe62ce7ce0
commit 394445f0b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Components/test/E2ETest/ServerExecutionTests/IgnitorTest.cs
View File

@ -75,11 +75,6 @@ namespace Microsoft.AspNetCore.Components
async Task IAsyncLifetime.DisposeAsync()
{
if (TestSink != null)
{
TestSink.MessageLogged -= TestSink_MessageLogged;
}
await DisposeAsync();
}
@ -90,6 +85,11 @@ namespace Microsoft.AspNetCore.Components
protected virtual Task DisposeAsync()
{
if (TestSink != null)
{
TestSink.MessageLogged -= TestSink_MessageLogged;
}
return Task.CompletedTask;
}
@ -97,7 +97,18 @@ namespace Microsoft.AspNetCore.Components
{
var log = new LogMessage(context.LogLevel, context.EventId, context.Message, context.Exception);
Logs.Enqueue(log);
Output.WriteLine(log.ToString());
try
{
// This might produce an InvalidOperationException when the logger tries to log a message after
// the test has completed but before the handler has been removed.
// ---> System.InvalidOperationException: There is no currently active test.
// For that reason, we capture the exception here and silence it, as the message is captured inside the Logs
// variable anyway.
Output.WriteLine(log.ToString());
}
catch (Exception)
{
}
}
[DebuggerDisplay("{LogLevel.ToString(),nq} - {Message ?? \"null\",nq} - {Exception?.Message,nq}")]